FATCHIP-GmbH / plugin-shopware5-klarna-checkout

Components/Klarna/klarnapclass.php

Spacing +1 added lines, -1 removed lines

@@ -207,7 +207,7 @@
         }
 
         foreach ($arr as $key => $val) {
-            switch($key) {
+            switch ($key) {
             case "0":
             case "eid":
                 $this->setEid($val);

Components/Klarna/Currency.php

Spacing +2 added lines, -2 removed lines

@@ -63,7 +63,7 @@ 
      */
     public static function fromCode($val)
     {
-        switch(strtolower($val)) {
+        switch (strtolower($val)) {
         case 'dkk':
             return self::DKK;
         case 'eur':
@@ -87,7 +87,7 @@ 
      */
     public static function getCode($val)
     {
-        switch($val) {
+        switch ($val) {
         case self::DKK:
             return 'dkk';
         case self::EUR:

Components/Klarna/klarnacalc.php

Spacing +15 added lines, -15 removed lines

@@ -61,7 +61,7 @@ 
      */
     private static function _midpoint($a, $b)
     {
-        return (($a+$b)/2);
+        return (($a + $b) / 2);
     }
 
     /**
@@ -82,7 +82,7 @@ 
     {
         $month = $fromdayone;
         foreach ($payarray as $payment) {
-            $pval -= $payment / pow(1 + $rate/(12*100.0), $month++);
+            $pval -= $payment / pow(1 + $rate / (12 * 100.0), $month++);
         }
 
         return ($pval);
@@ -126,7 +126,7 @@ 
         // Standard divide and conquer.
         do {
             $mid = self::_midpoint($low, $high);
-            $midval  = self::_npv($pval, $payarray, $mid, $fromdayone);
+            $midval = self::_npv($pval, $payarray, $mid, $fromdayone);
             if (abs($midval) < self::$accuracy) {
                 //we are close enough
                 return ($mid);
@@ -222,7 +222,7 @@ 
 
             $newpay = max($payment, $minpay);
             if ($base) {
-                $newpay = max($newpay, $bal/24.0 + $fee + $interest);
+                $newpay = max($newpay, $bal / 24.0 + $fee + $interest);
             }
 
             $bal = $newbal - $newpay;
@@ -255,11 +255,11 @@ 
         }
 
         if ($rate == 0) {
-            return $pval/$months;
+            return $pval / $months;
         }
 
-        $p = $rate / (100.0*12);
-        return $pval * $p / (1 - pow((1+$p), -$months));
+        $p = $rate / (100.0 * 12);
+        return $pval * $p / (1 - pow((1 + $p), -$months));
     }
 
     /**
@@ -376,7 +376,7 @@ 
         }
 
         if (!is_numeric($free)) {
-            throw new Klarna_InvalidTypeException('free',  'integer');
+            throw new Klarna_InvalidTypeException('free', 'integer');
         }
 
         if (is_numeric($free) && !is_int($free)) {
@@ -385,7 +385,7 @@ 
 
         if ($free < 0) {
             throw new KlarnaException(
-                'Error in ' . __METHOD__ .
+                'Error in '.__METHOD__.
                 ': Number of free months must be positive or zero!'
             );
         }
@@ -403,7 +403,7 @@ 
         ) {
             throw new Klarna_InvalidTypeException(
                 'flags',
-                KlarnaFlags::CHECKOUT_PAGE . ' or ' . KlarnaFlags::PRODUCT_PAGE
+                KlarnaFlags::CHECKOUT_PAGE.' or '.KlarnaFlags::PRODUCT_PAGE
             );
         }
 
@@ -435,7 +435,7 @@ 
         ) + $monthsfee;
 
         $type = $pclass->getType();
-        switch($type) {
+        switch ($type) {
         case KlarnaPClass::CAMPAIGN:
         case KlarnaPClass::ACCOUNT:
             return round(
@@ -505,7 +505,7 @@ 
         ) {
             throw new Klarna_InvalidTypeException(
                 'flags',
-                KlarnaFlags::CHECKOUT_PAGE . ' or ' . KlarnaFlags::PRODUCT_PAGE
+                KlarnaFlags::CHECKOUT_PAGE.' or '.KlarnaFlags::PRODUCT_PAGE
             );
         }
 
@@ -579,7 +579,7 @@ 
         ) {
             throw new Klarna_InvalidTypeException(
                 'flags',
-                KlarnaFlags::CHECKOUT_PAGE . ' or ' . KlarnaFlags::PRODUCT_PAGE
+                KlarnaFlags::CHECKOUT_PAGE.' or '.KlarnaFlags::PRODUCT_PAGE
             );
         }
 
@@ -639,7 +639,7 @@ 
     {
         $multiply = 1; //Round to closest integer
         $country = KlarnaCountry::getCode($country);
-        switch($country) {
+        switch ($country) {
         case "FI":
         case "DE":
         case "NL":
@@ -648,7 +648,7 @@ 
             break;
         }
 
-        return floor(($value*$multiply)+0.5)/$multiply;
+        return floor(($value * $multiply) + 0.5) / $multiply;
     }
 
 }

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

Spacing +552 added lines, -552 removed lines

@@ -35,11 +35,11 @@ 
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 // OF THE POSSIBILITY OF SUCH DAMAGE.
 
-	if(!function_exists('xml_parser_create'))
+	if (!function_exists('xml_parser_create'))
 	{
 		// For PHP 4 onward, XML functionality is always compiled-in on windows:
 		// no more need to dl-open it. It might have been compiled out on *nix...
-		if(strtoupper(substr(PHP_OS, 0, 3) != 'WIN'))
+		if (strtoupper(substr(PHP_OS, 0, 3) != 'WIN'))
 		{
 			dl('xml.so');
 		}
@@ -48,18 +48,18 @@ 
 	// G. Giunta 2005/01/29: declare global these variables,
 	// so that xmlrpc.inc will work even if included from within a function
 	// Milosch: 2005/08/07 - explicitly request these via $GLOBALS where used.
-	$GLOBALS['xmlrpcI4']='i4';
-	$GLOBALS['xmlrpcInt']='int';
-	$GLOBALS['xmlrpcBoolean']='boolean';
-	$GLOBALS['xmlrpcDouble']='double';
-	$GLOBALS['xmlrpcString']='string';
-	$GLOBALS['xmlrpcDateTime']='dateTime.iso8601';
-	$GLOBALS['xmlrpcBase64']='base64';
-	$GLOBALS['xmlrpcArray']='array';
-	$GLOBALS['xmlrpcStruct']='struct';
-	$GLOBALS['xmlrpcValue']='undefined';
-
-	$GLOBALS['xmlrpcTypes']=array(
+	$GLOBALS['xmlrpcI4'] = 'i4';
+	$GLOBALS['xmlrpcInt'] = 'int';
+	$GLOBALS['xmlrpcBoolean'] = 'boolean';
+	$GLOBALS['xmlrpcDouble'] = 'double';
+	$GLOBALS['xmlrpcString'] = 'string';
+	$GLOBALS['xmlrpcDateTime'] = 'dateTime.iso8601';
+	$GLOBALS['xmlrpcBase64'] = 'base64';
+	$GLOBALS['xmlrpcArray'] = 'array';
+	$GLOBALS['xmlrpcStruct'] = 'struct';
+	$GLOBALS['xmlrpcValue'] = 'undefined';
+
+	$GLOBALS['xmlrpcTypes'] = array(
 		$GLOBALS['xmlrpcI4']       => 1,
 		$GLOBALS['xmlrpcInt']      => 1,
 		$GLOBALS['xmlrpcBoolean']  => 1,
@@ -94,12 +94,12 @@ 
 	);
 
 	// define extra types for supporting NULL (useful for json or <NIL/>)
-	$GLOBALS['xmlrpcNull']='null';
-	$GLOBALS['xmlrpcTypes']['null']=1;
+	$GLOBALS['xmlrpcNull'] = 'null';
+	$GLOBALS['xmlrpcTypes']['null'] = 1;
 
 	// Not in use anymore since 2.0. Shall we remove it?
 	/// @deprecated
-	$GLOBALS['xmlEntities']=array(
+	$GLOBALS['xmlEntities'] = array(
 		'amp'  => '&',
 		'quot' => '"',
 		'lt'   => '<',
@@ -109,7 +109,7 @@ 
 
 	// tables used for transcoding different charsets into us-ascii xml
 
-	$GLOBALS['xml_iso88591_Entities']=array();
+	$GLOBALS['xml_iso88591_Entities'] = array();
 	$GLOBALS['xml_iso88591_Entities']['in'] = array();
 	$GLOBALS['xml_iso88591_Entities']['out'] = array();
 	for ($i = 0; $i < 32; $i++)
@@ -201,31 +201,31 @@ 
 	// The charset encoding used by the server for received messages and
 	// by the client for received responses when received charset cannot be determined
 	// or is not supported
-	$GLOBALS['xmlrpc_defencoding']='UTF-8';
+	$GLOBALS['xmlrpc_defencoding'] = 'UTF-8';
 
 	// The encoding used internally by PHP.
 	// String values received as xml will be converted to this, and php strings will be converted to xml
 	// as if having been coded with this
-	$GLOBALS['xmlrpc_internalencoding']='ISO-8859-1';
+	$GLOBALS['xmlrpc_internalencoding'] = 'ISO-8859-1';
 
-	$GLOBALS['xmlrpcName']='XML-RPC for PHP';
-	$GLOBALS['xmlrpcVersion']='3.0.0.beta';
+	$GLOBALS['xmlrpcName'] = 'XML-RPC for PHP';
+	$GLOBALS['xmlrpcVersion'] = '3.0.0.beta';
 
 	// let user errors start at 800
-	$GLOBALS['xmlrpcerruser']=800;
+	$GLOBALS['xmlrpcerruser'] = 800;
 	// let XML parse errors start at 100
-	$GLOBALS['xmlrpcerrxml']=100;
+	$GLOBALS['xmlrpcerrxml'] = 100;
 
 	// formulate backslashes for escaping regexp
 	// Not in use anymore since 2.0. Shall we remove it?
 	/// @deprecated
-	$GLOBALS['xmlrpc_backslash']=chr(92).chr(92);
+	$GLOBALS['xmlrpc_backslash'] = chr(92).chr(92);
 
 	// set to TRUE to enable correct decoding of <NIL/> and <EX:NIL/> values
-	$GLOBALS['xmlrpc_null_extension']=false;
+	$GLOBALS['xmlrpc_null_extension'] = false;
 
 	// set to TRUE to enable encoding of php NULL values to <EX:NIL/> instead of <NIL/>
-	$GLOBALS['xmlrpc_null_apache_encoding']=false;
+	$GLOBALS['xmlrpc_null_apache_encoding'] = false;
 
 	// used to store state during parsing
 	// quick explanation of components:
@@ -238,7 +238,7 @@ 
 	//   method - used to store method name
 	//   stack - array with genealogy of xml elements names:
 	//           used to validate nesting of xmlrpc elements
-	$GLOBALS['_xh']=null;
+	$GLOBALS['_xh'] = null;
 
 	/**
 	* Convert a string to the correct XML representation in a target charset
@@ -254,7 +254,7 @@ 
 	* @todo do a bit of basic benchmarking (strtr vs. str_replace)
 	* @todo	make usage of iconv() or recode_string() or mb_string() where available
 	*/
-	function xmlrpc_encode_entitites($data, $src_encoding='', $dest_encoding='')
+	function xmlrpc_encode_entitites($data, $src_encoding = '', $dest_encoding = '')
 	{
 		if ($src_encoding == '')
 		{
@@ -262,7 +262,7 @@ 
 			$src_encoding = $GLOBALS['xmlrpc_internalencoding'];
 		}
 
-		switch(strtoupper($src_encoding.'_'.$dest_encoding))
+		switch (strtoupper($src_encoding.'_'.$dest_encoding))
 		{
 			case 'ISO-8859-1_':
 			case 'ISO-8859-1_US-ASCII':
@@ -289,7 +289,7 @@ 
 	$escaped_data = '';
 	// be kind to users creating string xmlrpcvals out of different php types
 	$data = (string) $data;
-	$ns = strlen ($data);
+	$ns = strlen($data);
 	for ($nn = 0; $nn < $ns; $nn++)
 	{
 		$ch = $data[$nn];
@@ -298,7 +298,7 @@ 
 		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,41 +319,41 @@ 
 			} // switch
 		}
 		//2 11 110bbbbb 10bbbbbb (2047)
-		else if ($ii>>5 == 6)
+		else if ($ii >> 5 == 6)
 		{
 			$b1 = ($ii & 31);
-			$ii = ord($data[$nn+1]);
+			$ii = ord($data[$nn + 1]);
 			$b2 = ($ii & 63);
 			$ii = ($b1 * 64) + $b2;
-			$ent = sprintf ('&#%d;', $ii);
+			$ent = sprintf('&#%d;', $ii);
 			$escaped_data .= $ent;
 			$nn += 1;
 		}
 		//3 16 1110bbbb 10bbbbbb 10bbbbbb
-		else if ($ii>>4 == 14)
+		else if ($ii >> 4 == 14)
 		{
 			$b1 = ($ii & 15);
-			$ii = ord($data[$nn+1]);
+			$ii = ord($data[$nn + 1]);
 			$b2 = ($ii & 63);
-			$ii = ord($data[$nn+2]);
+			$ii = ord($data[$nn + 2]);
 			$b3 = ($ii & 63);
 			$ii = ((($b1 * 64) + $b2) * 64) + $b3;
-			$ent = sprintf ('&#%d;', $ii);
+			$ent = sprintf('&#%d;', $ii);
 			$escaped_data .= $ent;
 			$nn += 2;
 		}
 		//4 21 11110bbb 10bbbbbb 10bbbbbb 10bbbbbb
-		else if ($ii>>3 == 30)
+		else if ($ii >> 3 == 30)
 		{
 			$b1 = ($ii & 7);
-			$ii = ord($data[$nn+1]);
+			$ii = ord($data[$nn + 1]);
 			$b2 = ($ii & 63);
-			$ii = ord($data[$nn+2]);
+			$ii = ord($data[$nn + 2]);
 			$b3 = ($ii & 63);
-			$ii = ord($data[$nn+3]);
+			$ii = ord($data[$nn + 3]);
 			$b4 = ($ii & 63);
 			$ii = ((((($b1 * 64) + $b2) * 64) + $b3) * 64) + $b4;
-			$ent = sprintf ('&#%d;', $ii);
+			$ent = sprintf('&#%d;', $ii);
 			$escaped_data .= $ent;
 			$nn += 3;
 		}
@@ -386,7 +386,7 @@ 
 	}
 
 	/// xml parser handler function for opening element tags
-	function xmlrpc_se($parser, $name, $attrs, $accept_single_vals=false)
+	function xmlrpc_se($parser, $name, $attrs, $accept_single_vals = false)
 	{
 		// if invalid xmlrpc already detected, skip all processing
 		if ($GLOBALS['_xh']['isf'] < 2)
@@ -422,15 +422,15 @@ 
 				}
 			}
 
-			switch($name)
+			switch ($name)
 			{
 				// optimize for speed switch cases: most common cases first
 				case 'VALUE':
 					/// @todo we could check for 2 VALUE elements inside a MEMBER or PARAM element
-					$GLOBALS['_xh']['vt']='value'; // indicator: no value found yet
-					$GLOBALS['_xh']['ac']='';
-					$GLOBALS['_xh']['lv']=1;
-					$GLOBALS['_xh']['php_class']=null;
+					$GLOBALS['_xh']['vt'] = 'value'; // indicator: no value found yet
+					$GLOBALS['_xh']['ac'] = '';
+					$GLOBALS['_xh']['lv'] = 1;
+					$GLOBALS['_xh']['php_class'] = null;
 					break;
 				case 'I4':
 				case 'INT':
@@ -439,18 +439,18 @@ 
 				case 'DOUBLE':
 				case 'DATETIME.ISO8601':
 				case 'BASE64':
-					if ($GLOBALS['_xh']['vt']!='value')
+					if ($GLOBALS['_xh']['vt'] != 'value')
 					{
 						//two data elements inside a value: an error occurred!
 						$GLOBALS['_xh']['isf'] = 2;
 						$GLOBALS['_xh']['isf_reason'] = "$name element following a {$GLOBALS['_xh']['vt']} element inside a single value";
 						return;
 					}
-					$GLOBALS['_xh']['ac']=''; // reset the accumulator
+					$GLOBALS['_xh']['ac'] = ''; // reset the accumulator
 					break;
 				case 'STRUCT':
 				case 'ARRAY':
-					if ($GLOBALS['_xh']['vt']!='value')
+					if ($GLOBALS['_xh']['vt'] != 'value')
 					{
 						//two data elements inside a value: an error occurred!
 						$GLOBALS['_xh']['isf'] = 2;
@@ -468,10 +468,10 @@ 
 						$cur_val['php_class'] = $attrs['PHP_CLASS'];
 					}
 					$GLOBALS['_xh']['valuestack'][] = $cur_val;
-					$GLOBALS['_xh']['vt']='data'; // be prepared for a data element next
+					$GLOBALS['_xh']['vt'] = 'data'; // be prepared for a data element next
 					break;
 				case 'DATA':
-					if ($GLOBALS['_xh']['vt']!='data')
+					if ($GLOBALS['_xh']['vt'] != 'data')
 					{
 						//two data elements inside a value: an error occurred!
 						$GLOBALS['_xh']['isf'] = 2;
@@ -486,31 +486,31 @@ 
 				case 'METHODNAME':
 				case 'NAME':
 					/// @todo we could check for 2 NAME elements inside a MEMBER element
-					$GLOBALS['_xh']['ac']='';
+					$GLOBALS['_xh']['ac'] = '';
 					break;
 				case 'FAULT':
-					$GLOBALS['_xh']['isf']=1;
+					$GLOBALS['_xh']['isf'] = 1;
 					break;
 				case 'MEMBER':
-					$GLOBALS['_xh']['valuestack'][count($GLOBALS['_xh']['valuestack'])-1]['name']=''; // set member name to null, in case we do not find in the xml later on
+					$GLOBALS['_xh']['valuestack'][count($GLOBALS['_xh']['valuestack']) - 1]['name'] = ''; // set member name to null, in case we do not find in the xml later on
 					//$GLOBALS['_xh']['ac']='';
 					// Drop trough intentionally
 				case 'PARAM':
 					// clear value type, so we can check later if no value has been passed for this param/member
-					$GLOBALS['_xh']['vt']=null;
+					$GLOBALS['_xh']['vt'] = null;
 					break;
 				case 'NIL':
 				case 'EX:NIL':
 					if ($GLOBALS['xmlrpc_null_extension'])
 					{
-						if ($GLOBALS['_xh']['vt']!='value')
+						if ($GLOBALS['_xh']['vt'] != 'value')
 						{
 							//two data elements inside a value: an error occurred!
 							$GLOBALS['_xh']['isf'] = 2;
 							$GLOBALS['_xh']['isf_reason'] = "$name element following a {$GLOBALS['_xh']['vt']} element inside a single value";
 							return;
 						}
-						$GLOBALS['_xh']['ac']=''; // reset the accumulator
+						$GLOBALS['_xh']['ac'] = ''; // reset the accumulator
 						break;
 					}
 					// we do not support the <NIL/> extension, so
@@ -526,9 +526,9 @@ 
 			$GLOBALS['_xh']['stack'][] = $name;
 
 			/// @todo optimization creep: move this inside the big switch() above
-			if($name!='VALUE')
+			if ($name != 'VALUE')
 			{
-				$GLOBALS['_xh']['lv']=0;
+				$GLOBALS['_xh']['lv'] = 0;
 			}
 		}
 	}
@@ -550,14 +550,14 @@ 
 			// we also checked for proper nesting at start of elements...
 			$curr_elem = array_pop($GLOBALS['_xh']['stack']);
 
-			switch($name)
+			switch ($name)
 			{
 				case 'VALUE':
 					// This if() detects if no scalar was inside <VALUE></VALUE>
-					if ($GLOBALS['_xh']['vt']=='value')
+					if ($GLOBALS['_xh']['vt'] == 'value')
 					{
-						$GLOBALS['_xh']['value']=$GLOBALS['_xh']['ac'];
-						$GLOBALS['_xh']['vt']=$GLOBALS['xmlrpcString'];
+						$GLOBALS['_xh']['value'] = $GLOBALS['_xh']['ac'];
+						$GLOBALS['_xh']['vt'] = $GLOBALS['xmlrpcString'];
 					}
 
 					if ($rebuild_xmlrpcvals)
@@ -571,9 +571,9 @@ 
 						// 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;
+							$GLOBALS['_xh']['valuestack'][$vscount - 1]['values'][] = $temp;
 						}
 						else
 						{
@@ -592,9 +592,9 @@ 
 						// 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'];
+							$GLOBALS['_xh']['valuestack'][$vscount - 1]['values'][] = $GLOBALS['_xh']['value'];
 						}
 					}
 					break;
@@ -605,28 +605,28 @@ 
 				case 'DOUBLE':
 				case 'DATETIME.ISO8601':
 				case 'BASE64':
-					$GLOBALS['_xh']['vt']=strtolower($name);
+					$GLOBALS['_xh']['vt'] = strtolower($name);
 					/// @todo: optimization creep - remove the if/elseif cycle below
 					/// since the case() in which we are already did that
-					if ($name=='STRING')
+					if ($name == 'STRING')
 					{
-						$GLOBALS['_xh']['value']=$GLOBALS['_xh']['ac'];
+						$GLOBALS['_xh']['value'] = $GLOBALS['_xh']['ac'];
 					}
-					elseif ($name=='DATETIME.ISO8601')
+					elseif ($name == 'DATETIME.ISO8601')
 					{
 						if (!preg_match('/^[0-9]{8}T[0-9]{2}:[0-9]{2}:[0-9]{2}$/', $GLOBALS['_xh']['ac']))
 						{
 							error_log('XML-RPC: invalid value received in DATETIME: '.$GLOBALS['_xh']['ac']);
 						}
-						$GLOBALS['_xh']['vt']=$GLOBALS['xmlrpcDateTime'];
-						$GLOBALS['_xh']['value']=$GLOBALS['_xh']['ac'];
+						$GLOBALS['_xh']['vt'] = $GLOBALS['xmlrpcDateTime'];
+						$GLOBALS['_xh']['value'] = $GLOBALS['_xh']['ac'];
 					}
-					elseif ($name=='BASE64')
+					elseif ($name == 'BASE64')
 					{
 						/// @todo check for failure of base64 decoding / catch warnings
-						$GLOBALS['_xh']['value']=base64_decode($GLOBALS['_xh']['ac']);
+						$GLOBALS['_xh']['value'] = base64_decode($GLOBALS['_xh']['ac']);
 					}
-					elseif ($name=='BOOLEAN')
+					elseif ($name == 'BOOLEAN')
 					{
 						// special case here: we translate boolean 1 or 0 into PHP
 						// constants true or false.
@@ -634,19 +634,19 @@ 
 						// spec never mentions them (see eg. Blogger api docs)
 						// NB: this simple checks helps a lot sanitizing input, ie no
 						// security problems around here
-						if ($GLOBALS['_xh']['ac']=='1' || strcasecmp($GLOBALS['_xh']['ac'], 'true') == 0)
+						if ($GLOBALS['_xh']['ac'] == '1' || strcasecmp($GLOBALS['_xh']['ac'], 'true') == 0)
 						{
-							$GLOBALS['_xh']['value']=true;
+							$GLOBALS['_xh']['value'] = true;
 						}
 						else
 						{
 							// log if receiveing something strange, even though we set the value to false anyway
-							if ($GLOBALS['_xh']['ac']!='0' && strcasecmp($GLOBALS['_xh']['ac'], 'false') != 0)
+							if ($GLOBALS['_xh']['ac'] != '0' && strcasecmp($GLOBALS['_xh']['ac'], 'false') != 0)
 								error_log('XML-RPC: invalid value received in BOOLEAN: '.$GLOBALS['_xh']['ac']);
-							$GLOBALS['_xh']['value']=false;
+							$GLOBALS['_xh']['value'] = false;
 						}
 					}
-					elseif ($name=='DOUBLE')
+					elseif ($name == 'DOUBLE')
 					{
 						// we have a DOUBLE
 						// we must check that only 0123456789-.<space> are characters here
@@ -655,12 +655,12 @@ 
 						{
 							/// @todo: find a better way of throwing an error than this!
 							error_log('XML-RPC: non numeric value received in DOUBLE: '.$GLOBALS['_xh']['ac']);
-							$GLOBALS['_xh']['value']='ERROR_NON_NUMERIC_FOUND';
+							$GLOBALS['_xh']['value'] = 'ERROR_NON_NUMERIC_FOUND';
 						}
 						else
 						{
 							// it's ok, add it on
-							$GLOBALS['_xh']['value']=(double)$GLOBALS['_xh']['ac'];
+							$GLOBALS['_xh']['value'] = (double) $GLOBALS['_xh']['ac'];
 						}
 					}
 					else
@@ -671,19 +671,19 @@ 
 						{
 							/// @todo find a better way of throwing an error than this!
 							error_log('XML-RPC: non numeric value received in INT: '.$GLOBALS['_xh']['ac']);
-							$GLOBALS['_xh']['value']='ERROR_NON_NUMERIC_FOUND';
+							$GLOBALS['_xh']['value'] = 'ERROR_NON_NUMERIC_FOUND';
 						}
 						else
 						{
 							// it's ok, add it on
-							$GLOBALS['_xh']['value']=(int)$GLOBALS['_xh']['ac'];
+							$GLOBALS['_xh']['value'] = (int) $GLOBALS['_xh']['ac'];
 						}
 					}
 					//$GLOBALS['_xh']['ac']=''; // is this necessary?
-					$GLOBALS['_xh']['lv']=3; // indicate we've found a value
+					$GLOBALS['_xh']['lv'] = 3; // indicate we've found a value
 					break;
 				case 'NAME':
-					$GLOBALS['_xh']['valuestack'][count($GLOBALS['_xh']['valuestack'])-1]['name'] = $GLOBALS['_xh']['ac'];
+					$GLOBALS['_xh']['valuestack'][count($GLOBALS['_xh']['valuestack']) - 1]['name'] = $GLOBALS['_xh']['ac'];
 					break;
 				case 'MEMBER':
 					//$GLOBALS['_xh']['ac']=''; // is this necessary?
@@ -692,20 +692,20 @@ 
 					if ($GLOBALS['_xh']['vt'])
 					{
 						$vscount = count($GLOBALS['_xh']['valuestack']);
-						$GLOBALS['_xh']['valuestack'][$vscount-1]['values'][$GLOBALS['_xh']['valuestack'][$vscount-1]['name']] = $GLOBALS['_xh']['value'];
+						$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');
 					break;
 				case 'DATA':
 					//$GLOBALS['_xh']['ac']=''; // is this necessary?
-					$GLOBALS['_xh']['vt']=null; // reset this to check for 2 data elements in a row - even if they're empty
+					$GLOBALS['_xh']['vt'] = null; // reset this to check for 2 data elements in a row - even if they're empty
 					break;
 				case 'STRUCT':
 				case 'ARRAY':
 					// fetch out of stack array of values, and promote it to current value
 					$curr_val = array_pop($GLOBALS['_xh']['valuestack']);
 					$GLOBALS['_xh']['value'] = $curr_val['values'];
-					$GLOBALS['_xh']['vt']=strtolower($name);
+					$GLOBALS['_xh']['vt'] = strtolower($name);
 					if (isset($curr_val['php_class']))
 					{
 						$GLOBALS['_xh']['php_class'] = $curr_val['php_class'];
@@ -716,22 +716,22 @@ 
 					// unless no VALUE was found
 					if ($GLOBALS['_xh']['vt'])
 					{
-						$GLOBALS['_xh']['params'][]=$GLOBALS['_xh']['value'];
-						$GLOBALS['_xh']['pt'][]=$GLOBALS['_xh']['vt'];
+						$GLOBALS['_xh']['params'][] = $GLOBALS['_xh']['value'];
+						$GLOBALS['_xh']['pt'][] = $GLOBALS['_xh']['vt'];
 					}
 					else
 						error_log('XML-RPC: missing VALUE inside PARAM in received xml');
 					break;
 				case 'METHODNAME':
-					$GLOBALS['_xh']['method']=preg_replace('/^[\n\r\t ]+/', '', $GLOBALS['_xh']['ac']);
+					$GLOBALS['_xh']['method'] = preg_replace('/^[\n\r\t ]+/', '', $GLOBALS['_xh']['ac']);
 					break;
 				case 'NIL':
 				case 'EX:NIL':
 					if ($GLOBALS['xmlrpc_null_extension'])
 					{
-						$GLOBALS['_xh']['vt']='null';
-						$GLOBALS['_xh']['value']=null;
-						$GLOBALS['_xh']['lv']=3;
+						$GLOBALS['_xh']['vt'] = 'null';
+						$GLOBALS['_xh']['value'] = null;
+						$GLOBALS['_xh']['lv'] = 3;
 						break;
 					}
 					// drop through intentionally if nil extension not enabled
@@ -762,7 +762,7 @@ 
 		{
 			// "lookforvalue==3" means that we've found an entire value
 			// and should discard any further character data
-			if($GLOBALS['_xh']['lv']!=3)
+			if ($GLOBALS['_xh']['lv'] != 3)
 			{
 				// G. Giunta 2006-08-23: useless change of 'lv' from 1 to 2
 				//if($GLOBALS['_xh']['lv']==1)
@@ -776,7 +776,7 @@ 
 				//{
 				//	$GLOBALS['_xh']['ac'] = '';
 				//}
-				$GLOBALS['_xh']['ac'].=$data;
+				$GLOBALS['_xh']['ac'] .= $data;
 			}
 		}
 	}
@@ -788,14 +788,14 @@ 
 		// skip processing if xml fault already detected
 		if ($GLOBALS['_xh']['isf'] < 2)
 		{
-			if(substr($data, 0, 1) == '&' && substr($data, -1, 1) == ';')
+			if (substr($data, 0, 1) == '&' && substr($data, -1, 1) == ';')
 			{
 				// G. Giunta 2006-08-25: useless change of 'lv' from 1 to 2
 				//if($GLOBALS['_xh']['lv']==1)
 				//{
 				//	$GLOBALS['_xh']['lv']=2;
 				//}
-				$GLOBALS['_xh']['ac'].=$data;
+				$GLOBALS['_xh']['ac'] .= $data;
 			}
 		}
 		return true;
@@ -805,30 +805,30 @@ 
 	{
 		var $path;
 		var $server;
-		var $port=0;
-		var $method='http';
+		var $port = 0;
+		var $method = 'http';
 		var $errno;
 		var $errstr;
-		var $debug=0;
-		var $username='';
-		var $password='';
-		var $authtype=1;
-		var $cert='';
-		var $certpass='';
-		var $cacert='';
-		var $cacertdir='';
-		var $key='';
-		var $keypass='';
-		var $verifypeer=true;
-		var $verifyhost=1;
-		var $no_multicall=false;
-		var $proxy='';
-		var $proxyport=0;
-		var $proxy_user='';
-		var $proxy_pass='';
-		var $proxy_authtype=1;
-		var $cookies=array();
-		var $extracurlopts=array();
+		var $debug = 0;
+		var $username = '';
+		var $password = '';
+		var $authtype = 1;
+		var $cert = '';
+		var $certpass = '';
+		var $cacert = '';
+		var $cacertdir = '';
+		var $key = '';
+		var $keypass = '';
+		var $verifypeer = true;
+		var $verifyhost = 1;
+		var $no_multicall = false;
+		var $proxy = '';
+		var $proxyport = 0;
+		var $proxy_user = '';
+		var $proxy_pass = '';
+		var $proxy_authtype = 1;
+		var $cookies = array();
+		var $extracurlopts = array();
 
 		/**
 		* List of http compression methods accepted by the client for responses.
@@ -872,59 +872,59 @@ 
 		* @param integer $port the port the server is listening on, defaults to 80 or 443 depending on protocol used
 		* @param string $method the http protocol variant: defaults to 'http', 'https' and 'http11' can be used if CURL is installed
 		*/
-		function xmlrpc_client($path, $server='', $port='', $method='')
+		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;
+				$this->path = '/'.$path;
 			}
 			else
 			{
-				$this->path=$path;
+				$this->path = $path;
 			}
-			$this->server=$server;
-			if($port != '')
+			$this->server = $server;
+			if ($port != '')
 			{
-				$this->port=$port;
+				$this->port = $port;
 			}
-			if($method != '')
+			if ($method != '')
 			{
-				$this->method=$method;
+				$this->method = $method;
 			}
 
 			// if ZLIB is enabled, let the client by default accept compressed responses
-			if(function_exists('gzinflate') || (
+			if (function_exists('gzinflate') || (
 				function_exists('curl_init') && (($info = curl_version()) &&
 				((is_string($info) && strpos($info, 'zlib') !== null) || isset($info['libz_version'])))
 			))
@@ -939,7 +939,7 @@ 
 			$this->accepted_charset_encodings = array('UTF-8', 'ISO-8859-1', 'US-ASCII');
 
 			// initialize user_agent string
-			$this->user_agent = $GLOBALS['xmlrpcName'] . ' ' . $GLOBALS['xmlrpcVersion'];
+			$this->user_agent = $GLOBALS['xmlrpcName'].' '.$GLOBALS['xmlrpcVersion'];
 		}
 
 		/**
@@ -949,7 +949,7 @@ 
 		*/
 		function setDebug($in)
 		{
-			$this->debug=$in;
+			$this->debug = $in;
 		}
 
 		/**
@@ -959,11 +959,11 @@ 
 		* @param integer $t auth type. See curl_setopt man page for supported auth types. Defaults to CURLAUTH_BASIC (basic auth)
 		* @access public
 		*/
-		function setCredentials($u, $p, $t=1)
+		function setCredentials($u, $p, $t = 1)
 		{
-			$this->username=$u;
-			$this->password=$p;
-			$this->authtype=$t;
+			$this->username = $u;
+			$this->password = $p;
+			$this->authtype = $t;
 		}
 
 		/**
@@ -985,7 +985,7 @@ 
 		* @param bool $is_dir set to true to indicate cacert is a dir. defaults to false
 		* @access public
 		*/
-		function setCaCertificate($cacert, $is_dir=false)
+		function setCaCertificate($cacert, $is_dir = false)
 		{
 			if ($is_dir)
 			{
@@ -1090,7 +1090,7 @@ 
 		*
 		* @todo check correctness of urlencoding cookie value (copied from php way of doing it...)
 		*/
-		function setCookie($name, $value='', $path='', $domain='', $port=null)
+		function setCookie($name, $value = '', $path = '', $domain = '', $port = null)
 		{
 			$this->cookies[$name]['value'] = urlencode($value);
 			if ($path || $domain || $port)
@@ -1111,7 +1111,7 @@ 
 		* It allows eg. to bind client to a specific IP interface / address
 		* @param $options array
 		*/
-		function SetCurlOptions( $options )
+		function SetCurlOptions($options)
 		{
 			$this->extracurlopts = $options;
 		}
@@ -1120,7 +1120,7 @@ 
 		* Set user-agent string that will be used by this client instance
 		* in http headers sent to the server
 		*/
-		function SetUserAgent( $agentstring )
+		function SetUserAgent($agentstring)
 		{
 			$this->user_agent = $agentstring;
 		}
@@ -1133,22 +1133,22 @@ 
 		* @return xmlrpcresp
 		* @access public
 		*/
-		function& send($msg, $timeout=0, $method='')
+		function& send($msg, $timeout = 0, $method = '')
 		{
 			// if user deos not specify http protocol, use native method of this client
 			// (i.e. method set during call to constructor)
-			if($method == '')
+			if ($method == '')
 			{
 				$method = $this->method;
 			}
 
-			if(is_array($msg))
+			if (is_array($msg))
 			{
 				// $msg is an array of xmlrpcmsg's
 				$r = $this->multicall($msg, $timeout, $method);
 				return $r;
 			}
-			elseif(is_string($msg))
+			elseif (is_string($msg))
 			{
 				$n = new xmlrpcmsg('');
 				$n->payload = $msg;
@@ -1156,11 +1156,11 @@ 
 			}
 
 			// where msg is an xmlrpcmsg
-			$msg->debug=$this->debug;
+			$msg->debug = $this->debug;
 
-			if($method == 'https')
+			if ($method == 'https')
 			{
-				$r =& $this->sendPayloadHTTPS(
+				$r = & $this->sendPayloadHTTPS(
 					$msg,
 					$this->server,
 					$this->port,
@@ -1182,9 +1182,9 @@ 
 					$this->keypass
 				);
 			}
-			elseif($method == 'http11')
+			elseif ($method == 'http11')
 			{
-				$r =& $this->sendPayloadCURL(
+				$r = & $this->sendPayloadCURL(
 					$msg,
 					$this->server,
 					$this->port,
@@ -1207,7 +1207,7 @@ 
 			}
 			else
 			{
-				$r =& $this->sendPayloadHTTP10(
+				$r = & $this->sendPayloadHTTP10(
 					$msg,
 					$this->server,
 					$this->port,
@@ -1229,29 +1229,29 @@ 
 		/**
 		* @access private
 		*/
-		function &sendPayloadHTTP10($msg, $server, $port, $timeout=0,
-			$username='', $password='', $authtype=1, $proxyhost='',
-			$proxyport=0, $proxyusername='', $proxypassword='', $proxyauthtype=1)
+		function &sendPayloadHTTP10($msg, $server, $port, $timeout = 0,
+			$username = '', $password = '', $authtype = 1, $proxyhost = '',
+			$proxyport = 0, $proxyusername = '', $proxypassword = '', $proxyauthtype = 1)
 		{
-			if($port==0)
+			if ($port == 0)
 			{
-				$port=80;
+				$port = 80;
 			}
 
 			// Only create the payload if it was not created previously
-			if(empty($msg->payload))
+			if (empty($msg->payload))
 			{
 				$msg->createPayload($this->request_charset_encoding);
 			}
 
 			$payload = $msg->payload;
 			// Deflate request body and set appropriate request headers
-			if(function_exists('gzdeflate') && ($this->request_compression == 'gzip' || $this->request_compression == 'deflate'))
+			if (function_exists('gzdeflate') && ($this->request_compression == 'gzip' || $this->request_compression == 'deflate'))
 			{
-				if($this->request_compression == 'gzip')
+				if ($this->request_compression == 'gzip')
 				{
 					$a = @gzencode($payload);
-					if($a)
+					if ($a)
 					{
 						$payload = $a;
 						$encoding_hdr = "Content-Encoding: gzip\r\n";
@@ -1260,7 +1260,7 @@ 
 				else
 				{
 					$a = @gzcompress($payload);
-					if($a)
+					if ($a)
 					{
 						$payload = $a;
 						$encoding_hdr = "Content-Encoding: deflate\r\n";
@@ -1273,10 +1273,10 @@ 
 			}
 
 			// thanks to Grant Rauscher <grant7@firstworld.net> for this
-			$credentials='';
-			if($username!='')
+			$credentials = '';
+			if ($username != '')
 			{
-				$credentials='Authorization: Basic ' . base64_encode($username . ':' . $password) . "\r\n";
+				$credentials = 'Authorization: Basic '.base64_encode($username.':'.$password)."\r\n";
 				if ($authtype != 1)
 				{
 					error_log('XML-RPC: '.__METHOD__.': warning. Only Basic auth is supported with HTTP 1.0');
@@ -1284,28 +1284,28 @@ 
 			}
 
 			$accepted_encoding = '';
-			if(is_array($this->accepted_compression) && count($this->accepted_compression))
+			if (is_array($this->accepted_compression) && count($this->accepted_compression))
 			{
-				$accepted_encoding = 'Accept-Encoding: ' . implode(', ', $this->accepted_compression) . "\r\n";
+				$accepted_encoding = 'Accept-Encoding: '.implode(', ', $this->accepted_compression)."\r\n";
 			}
 
 			$proxy_credentials = '';
-			if($proxyhost)
+			if ($proxyhost)
 			{
-				if($proxyport == 0)
+				if ($proxyport == 0)
 				{
 					$proxyport = 8080;
 				}
 				$connectserver = $proxyhost;
 				$connectport = $proxyport;
 				$uri = 'http://'.$server.':'.$port.$this->path;
-				if($proxyusername != '')
+				if ($proxyusername != '')
 				{
 					if ($proxyauthtype != 1)
 					{
 						error_log('XML-RPC: '.__METHOD__.': warning. Only Basic auth to proxy is supported with HTTP 1.0');
 					}
-					$proxy_credentials = 'Proxy-Authorization: Basic ' . base64_encode($proxyusername.':'.$proxypassword) . "\r\n";
+					$proxy_credentials = 'Proxy-Authorization: Basic '.base64_encode($proxyusername.':'.$proxypassword)."\r\n";
 				}
 			}
 			else
@@ -1317,7 +1317,7 @@ 
 
 			// Cookie generation, as per rfc2965 (version 1 cookies) or
 			// netscape's rules (version 0 cookies)
-			$cookieheader='';
+			$cookieheader = '';
 			if (count($this->cookies))
 			{
 				$version = '';
@@ -1325,70 +1325,70 @@ 
 				{
 					if ($cookie['version'])
 					{
-						$version = ' $Version="' . $cookie['version'] . '";';
-						$cookieheader .= ' ' . $name . '="' . $cookie['value'] . '";';
+						$version = ' $Version="'.$cookie['version'].'";';
+						$cookieheader .= ' '.$name.'="'.$cookie['value'].'";';
 						if ($cookie['path'])
-							$cookieheader .= ' $Path="' . $cookie['path'] . '";';
+							$cookieheader .= ' $Path="'.$cookie['path'].'";';
 						if ($cookie['domain'])
-							$cookieheader .= ' $Domain="' . $cookie['domain'] . '";';
+							$cookieheader .= ' $Domain="'.$cookie['domain'].'";';
 						if ($cookie['port'])
-							$cookieheader .= ' $Port="' . $cookie['port'] . '";';
+							$cookieheader .= ' $Port="'.$cookie['port'].'";';
 					}
 					else
 					{
-						$cookieheader .= ' ' . $name . '=' . $cookie['value'] . ";";
+						$cookieheader .= ' '.$name.'='.$cookie['value'].";";
 					}
 				}
-				$cookieheader = 'Cookie:' . $version . substr($cookieheader, 0, -1) . "\r\n";
+				$cookieheader = 'Cookie:'.$version.substr($cookieheader, 0, -1)."\r\n";
 			}
 
-			$op= 'POST ' . $uri. " HTTP/1.0\r\n" .
-				'User-Agent: ' . $this->user_agent . "\r\n" .
-				'Host: '. $server . ':' . $port . "\r\n" .
-				$credentials .
-				$proxy_credentials .
-				$accepted_encoding .
-				$encoding_hdr .
-				'Accept-Charset: ' . implode(',', $this->accepted_charset_encodings) . "\r\n" .
-				$cookieheader .
-				'Content-Type: ' . $msg->content_type . "\r\nContent-Length: " .
-				strlen($payload) . "\r\n\r\n" .
+			$op = 'POST '.$uri." HTTP/1.0\r\n".
+				'User-Agent: '.$this->user_agent."\r\n".
+				'Host: '.$server.':'.$port."\r\n".
+				$credentials.
+				$proxy_credentials.
+				$accepted_encoding.
+				$encoding_hdr.
+				'Accept-Charset: '.implode(',', $this->accepted_charset_encodings)."\r\n".
+				$cookieheader.
+				'Content-Type: '.$msg->content_type."\r\nContent-Length: ".
+				strlen($payload)."\r\n\r\n".
 				$payload;
 
-			if($this->debug > 1)
+			if ($this->debug > 1)
 			{
-				print "<PRE>\n---SENDING---\n" . htmlentities($op) . "\n---END---\n</PRE>";
+				print "<PRE>\n---SENDING---\n".htmlentities($op)."\n---END---\n</PRE>";
 				// let the client see this now in case http times out...
 				flush();
 			}
 
-			if($timeout>0)
+			if ($timeout > 0)
 			{
-				$fp=@fsockopen($connectserver, $connectport, $this->errno, $this->errstr, $timeout);
+				$fp = @fsockopen($connectserver, $connectport, $this->errno, $this->errstr, $timeout);
 			}
 			else
 			{
-				$fp=@fsockopen($connectserver, $connectport, $this->errno, $this->errstr);
+				$fp = @fsockopen($connectserver, $connectport, $this->errno, $this->errstr);
 			}
-			if($fp)
+			if ($fp)
 			{
-				if($timeout>0 && function_exists('stream_set_timeout'))
+				if ($timeout > 0 && function_exists('stream_set_timeout'))
 				{
 					stream_set_timeout($fp, $timeout);
 				}
 			}
 			else
 			{
-				$this->errstr='Connect error: '.$this->errstr;
-				$r=new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['http_error'], $this->errstr . ' (' . $this->errno . ')');
+				$this->errstr = 'Connect error: '.$this->errstr;
+				$r = new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['http_error'], $this->errstr.' ('.$this->errno.')');
 				return $r;
 			}
 
-			if(!fputs($fp, $op, strlen($op)))
+			if (!fputs($fp, $op, strlen($op)))
 			{
 				fclose($fp);
-				$this->errstr='Write error';
-				$r=new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['http_error'], $this->errstr);
+				$this->errstr = 'Write error';
+				$r = new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['http_error'], $this->errstr);
 				return $r;
 			}
 			else
@@ -1398,15 +1398,15 @@ 
 			}
 			// 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='';
+			$ipd = '';
 			do
 			{
 				// shall we check for $data === FALSE?
 				// as per the manual, it signals an error
-				$ipd.=fread($fp, 32768);
-			} while(!feof($fp));
+				$ipd .= fread($fp, 32768);
+			} while (!feof($fp));
 			fclose($fp);
-			$r =& $msg->parseResponse($ipd, false, $this->return_type);
+			$r = & $msg->parseResponse($ipd, false, $this->return_type);
 			return $r;
 
 		}
@@ -1414,12 +1414,12 @@ 
 		/**
 		* @access private
 		*/
-		function &sendPayloadHTTPS($msg, $server, $port, $timeout=0, $username='',
-			$password='', $authtype=1, $cert='',$certpass='', $cacert='', $cacertdir='',
-			$proxyhost='', $proxyport=0, $proxyusername='', $proxypassword='', $proxyauthtype=1,
-			$keepalive=false, $key='', $keypass='')
+		function &sendPayloadHTTPS($msg, $server, $port, $timeout = 0, $username = '',
+			$password = '', $authtype = 1, $cert = '', $certpass = '', $cacert = '', $cacertdir = '',
+			$proxyhost = '', $proxyport = 0, $proxyusername = '', $proxypassword = '', $proxyauthtype = 1,
+			$keepalive = false, $key = '', $keypass = '')
 		{
-			$r =& $this->sendPayloadCURL($msg, $server, $port, $timeout, $username,
+			$r = & $this->sendPayloadCURL($msg, $server, $port, $timeout, $username,
 				$password, $authtype, $cert, $certpass, $cacert, $cacertdir, $proxyhost, $proxyport,
 				$proxyusername, $proxypassword, $proxyauthtype, 'https', $keepalive, $key, $keypass);
 			return $r;
@@ -1431,31 +1431,31 @@ 
 		* NB: CURL versions before 7.11.10 cannot use proxy to talk to https servers!
 		* @access private
 		*/
-		function &sendPayloadCURL($msg, $server, $port, $timeout=0, $username='',
-			$password='', $authtype=1, $cert='', $certpass='', $cacert='', $cacertdir='',
-			$proxyhost='', $proxyport=0, $proxyusername='', $proxypassword='', $proxyauthtype=1, $method='https',
-			$keepalive=false, $key='', $keypass='')
+		function &sendPayloadCURL($msg, $server, $port, $timeout = 0, $username = '',
+			$password = '', $authtype = 1, $cert = '', $certpass = '', $cacert = '', $cacertdir = '',
+			$proxyhost = '', $proxyport = 0, $proxyusername = '', $proxypassword = '', $proxyauthtype = 1, $method = 'https',
+			$keepalive = false, $key = '', $keypass = '')
 		{
-			if(!function_exists('curl_init'))
+			if (!function_exists('curl_init'))
 			{
-				$this->errstr='CURL unavailable on this install';
-				$r=new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['no_curl'], $GLOBALS['xmlrpcstr']['no_curl']);
+				$this->errstr = 'CURL unavailable on this install';
+				$r = new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['no_curl'], $GLOBALS['xmlrpcstr']['no_curl']);
 				return $r;
 			}
-			if($method == 'https')
+			if ($method == 'https')
 			{
-				if(($info = curl_version()) &&
+				if (($info = curl_version()) &&
 					((is_string($info) && strpos($info, 'OpenSSL') === null) || (is_array($info) && !isset($info['ssl_version']))))
 				{
-					$this->errstr='SSL unavailable on this install';
-					$r=new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['no_ssl'], $GLOBALS['xmlrpcstr']['no_ssl']);
+					$this->errstr = 'SSL unavailable on this install';
+					$r = new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['no_ssl'], $GLOBALS['xmlrpcstr']['no_ssl']);
 					return $r;
 				}
 			}
 
-			if($port == 0)
+			if ($port == 0)
 			{
-				if($method == 'http')
+				if ($method == 'http')
 				{
 					$port = 80;
 				}
@@ -1466,19 +1466,19 @@ 
 			}
 
 			// Only create the payload if it was not created previously
-			if(empty($msg->payload))
+			if (empty($msg->payload))
 			{
 				$msg->createPayload($this->request_charset_encoding);
 			}
 
 			// Deflate request body and set appropriate request headers
 			$payload = $msg->payload;
-			if(function_exists('gzdeflate') && ($this->request_compression == 'gzip' || $this->request_compression == 'deflate'))
+			if (function_exists('gzdeflate') && ($this->request_compression == 'gzip' || $this->request_compression == 'deflate'))
 			{
-				if($this->request_compression == 'gzip')
+				if ($this->request_compression == 'gzip')
 				{
 					$a = @gzencode($payload);
-					if($a)
+					if ($a)
 					{
 						$payload = $a;
 						$encoding_hdr = 'Content-Encoding: gzip';
@@ -1487,7 +1487,7 @@ 
 				else
 				{
 					$a = @gzcompress($payload);
-					if($a)
+					if ($a)
 					{
 						$payload = $a;
 						$encoding_hdr = 'Content-Encoding: deflate';
@@ -1499,17 +1499,17 @@ 
 				$encoding_hdr = '';
 			}
 
-			if($this->debug > 1)
+			if ($this->debug > 1)
 			{
-				print "<PRE>\n---SENDING---\n" . htmlentities($payload) . "\n---END---\n</PRE>";
+				print "<PRE>\n---SENDING---\n".htmlentities($payload)."\n---END---\n</PRE>";
 				// let the client see this now in case http times out...
 				flush();
 			}
 
-			if(!$keepalive || !$this->xmlrpc_curl_handle)
+			if (!$keepalive || !$this->xmlrpc_curl_handle)
 			{
-				$curl = curl_init($method . '://' . $server . ':' . $port . $this->path);
-				if($keepalive)
+				$curl = curl_init($method.'://'.$server.':'.$port.$this->path);
+				if ($keepalive)
 				{
 					$this->xmlrpc_curl_handle = $curl;
 				}
@@ -1522,7 +1522,7 @@ 
 			// results into variable
 			curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
 
-			if($this->debug)
+			if ($this->debug)
 			{
 				curl_setopt($curl, CURLOPT_VERBOSE, 1);
 			}
@@ -1539,7 +1539,7 @@ 
 			// NB: if we set an empty string, CURL will add http header indicating
 			// ALL methods it is supporting. This is possibly a better option than
 			// letting the user tell what curl can / cannot do...
-			if(is_array($this->accepted_compression) && count($this->accepted_compression))
+			if (is_array($this->accepted_compression) && count($this->accepted_compression))
 			{
 				//curl_setopt($curl, CURLOPT_ENCODING, implode(',', $this->accepted_compression));
 				// empty string means 'any supported by CURL' (shall we catch errors in case CURLOPT_SSLKEY undefined ?)
@@ -1551,26 +1551,26 @@ 
 					curl_setopt($curl, CURLOPT_ENCODING, '');
 			}
 			// extra headers
-			$headers = array('Content-Type: ' . $msg->content_type , 'Accept-Charset: ' . implode(',', $this->accepted_charset_encodings));
+			$headers = array('Content-Type: '.$msg->content_type, 'Accept-Charset: '.implode(',', $this->accepted_charset_encodings));
 			// if no keepalive is wanted, let the server know it in advance
-			if(!$keepalive)
+			if (!$keepalive)
 			{
 				$headers[] = 'Connection: close';
 			}
 			// request compression header
-			if($encoding_hdr)
+			if ($encoding_hdr)
 			{
 				$headers[] = $encoding_hdr;
 			}
 
 			curl_setopt($curl, CURLOPT_HTTPHEADER, $headers);
 			// timeout is borked
-			if($timeout)
+			if ($timeout)
 			{
 				curl_setopt($curl, CURLOPT_TIMEOUT, $timeout == 1 ? 1 : $timeout - 1);
 			}
 
-			if($username && $password)
+			if ($username && $password)
 			{
 				curl_setopt($curl, CURLOPT_USERPWD, $username.':'.$password);
 				if (defined('CURLOPT_HTTPAUTH'))
@@ -1583,36 +1583,36 @@ 
 				}
 			}
 
-			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);
 				}
@@ -1621,15 +1621,15 @@ 
 			}
 
 			// proxy info
-			if($proxyhost)
+			if ($proxyhost)
 			{
-				if($proxyport == 0)
+				if ($proxyport == 0)
 				{
 					$proxyport = 8080; // NB: even for HTTPS, local connection is on port 8080
 				}
 				curl_setopt($curl, CURLOPT_PROXY, $proxyhost.':'.$proxyport);
 				//curl_setopt($curl, CURLOPT_PROXYPORT,$proxyport);
-				if($proxyusername)
+				if ($proxyusername)
 				{
 					curl_setopt($curl, CURLOPT_PROXYUSERPWD, $proxyusername.':'.$proxypassword);
 					if (defined('CURLOPT_PROXYAUTH'))
@@ -1651,7 +1651,7 @@ 
 				$cookieheader = '';
 				foreach ($this->cookies as $name => $cookie)
 				{
-					$cookieheader .= $name . '=' . $cookie['value'] . '; ';
+					$cookieheader .= $name.'='.$cookie['value'].'; ';
 				}
 				curl_setopt($curl, CURLOPT_COOKIE, substr($cookieheader, 0, -2));
 			}
@@ -1666,28 +1666,28 @@ 
 			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));
+				$this->errstr = 'no response';
+				$resp = new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['curl_fail'], $GLOBALS['xmlrpcstr']['curl_fail'].': '.curl_error($curl));
 				curl_close($curl);
-				if($keepalive)
+				if ($keepalive)
 				{
 					$this->xmlrpc_curl_handle = null;
 				}
 			}
 			else
 			{
-				if(!$keepalive)
+				if (!$keepalive)
 				{
 					curl_close($curl);
 				}
-				$resp =& $msg->parseResponse($result, true, $this->return_type);
+				$resp = & $msg->parseResponse($result, true, $this->return_type);
 			}
 			return $resp;
 		}
@@ -1714,16 +1714,16 @@ 
 		* @return array
 		* @access public
 		*/
-		function multicall($msgs, $timeout=0, $method='', $fallback=true)
+		function multicall($msgs, $timeout = 0, $method = '', $fallback = true)
 		{
 			if ($method == '')
 			{
 				$method = $this->method;
 			}
-			if(!$this->no_multicall)
+			if (!$this->no_multicall)
 			{
 				$results = $this->_try_multicall($msgs, $timeout, $method);
-				if(is_array($results))
+				if (is_array($results))
 				{
 					// System.multicall succeeded
 					return $results;
@@ -1762,9 +1762,9 @@ 
 			{
 				// system.multicall is (probably) unsupported by server:
 				// emulate multicall via multiple requests
-				foreach($msgs as $msg)
+				foreach ($msgs as $msg)
 				{
-					$results[] =& $this->send($msg, $timeout, $method);
+					$results[] = & $this->send($msg, $timeout, $method);
 				}
 			}
 			else
@@ -1772,7 +1772,7 @@ 
 				// user does NOT want to fallback on many single calls:
 				// since we should always return an array of responses,
 				// return an array with the same error repeated n times
-				foreach($msgs as $msg)
+				foreach ($msgs as $msg)
 				{
 					$results[] = $result;
 				}
@@ -1790,12 +1790,12 @@ 
 		{
 			// Construct multicall message
 			$calls = array();
-			foreach($msgs as $msg)
+			foreach ($msgs as $msg)
 			{
-				$call['methodName'] = new xmlrpcval($msg->method(),'string');
+				$call['methodName'] = new xmlrpcval($msg->method(), 'string');
 				$numParams = $msg->getNumParams();
 				$params = array();
-				for($i = 0; $i < $numParams; $i++)
+				for ($i = 0; $i < $numParams; $i++)
 				{
 					$params[$i] = $msg->getParam($i);
 				}
@@ -1806,9 +1806,9 @@ 
 			$multicall->addParam(new xmlrpcval($calls, 'array'));
 
 			// Attempt RPC call
-			$result =& $this->send($multicall, $timeout, $method);
+			$result = & $this->send($multicall, $timeout, $method);
 
-			if($result->faultCode() != 0)
+			if ($result->faultCode() != 0)
 			{
 				// call to system.multicall failed
 				return $result;
@@ -1825,29 +1825,29 @@ 
 			{
 				///@todo test this code branch...
 				$rets = $result->value();
-				if(!is_array($rets))
+				if (!is_array($rets))
 				{
-					return false;		// bad return type from system.multicall
+					return false; // bad return type from system.multicall
 				}
 				$numRets = count($rets);
-				if($numRets != count($msgs))
+				if ($numRets != count($msgs))
 				{
-					return false;		// wrong number of return values.
+					return false; // wrong number of return values.
 				}
 
 				$response = array();
-				for($i = 0; $i < $numRets; $i++)
+				for ($i = 0; $i < $numRets; $i++)
 				{
 					$val = $rets[$i];
 					if (!is_array($val)) {
 						return false;
 					}
-					switch(count($val))
+					switch (count($val))
 					{
 						case 1:
-							if(!isset($val[0]))
+							if (!isset($val[0]))
 							{
-								return false;		// Bad value
+								return false; // Bad value
 							}
 							// Normal return value
 							$response[$i] = new xmlrpcresp($val[0], 0, '', 'phpvals');
@@ -1855,12 +1855,12 @@ 
 						case 2:
 							///	@todo remove usage of @: it is apparently quite slow
 							$code = @$val['faultCode'];
-							if(!is_int($code))
+							if (!is_int($code))
 							{
 								return false;
 							}
 							$str = @$val['faultString'];
-							if(!is_string($str))
+							if (!is_string($str))
 							{
 								return false;
 							}
@@ -1875,38 +1875,38 @@ 
 			else // return type == 'xmlrpcvals'
 			{
 				$rets = $result->value();
-				if($rets->kindOf() != 'array')
+				if ($rets->kindOf() != 'array')
 				{
-					return false;		// bad return type from system.multicall
+					return false; // bad return type from system.multicall
 				}
 				$numRets = $rets->arraysize();
-				if($numRets != count($msgs))
+				if ($numRets != count($msgs))
 				{
-					return false;		// wrong number of return values.
+					return false; // wrong number of return values.
 				}
 
 				$response = array();
-				for($i = 0; $i < $numRets; $i++)
+				for ($i = 0; $i < $numRets; $i++)
 				{
 					$val = $rets->arraymem($i);
-					switch($val->kindOf())
+					switch ($val->kindOf())
 					{
 						case 'array':
-							if($val->arraysize() != 1)
+							if ($val->arraysize() != 1)
 							{
-								return false;		// Bad value
+								return false; // Bad value
 							}
 							// Normal return value
 							$response[$i] = new xmlrpcresp($val->arraymem(0));
 							break;
 						case 'struct':
 							$code = $val->structmem('faultCode');
-							if($code->kindOf() != 'scalar' || $code->scalartyp() != 'int')
+							if ($code->kindOf() != 'scalar' || $code->scalartyp() != 'int')
 							{
 								return false;
 							}
 							$str = $val->structmem('faultString');
-							if($str->kindOf() != 'scalar' || $str->scalartyp() != 'string')
+							if ($str->kindOf() != 'scalar' || $str->scalartyp() != 'string')
 							{
 								return false;
 							}
@@ -1943,9 +1943,9 @@ 
 		* NB: as of now we do not do it, since it might be either an xmlrpcval or a plain
 		* php val, or a complete xml chunk, depending on usage of xmlrpc_client::send() inside which creator is called...
 		*/
-		function xmlrpcresp($val, $fcode = 0, $fstr = '', $valtyp='')
+		function xmlrpcresp($val, $fcode = 0, $fstr = '', $valtyp = '')
 		{
-			if($fcode != 0)
+			if ($fcode != 0)
 			{
 				// error response
 				$this->errno = $fcode;
@@ -2033,31 +2033,31 @@ 
 		* @return string the xml representation of the response
 		* @access public
 		*/
-		function serialize($charset_encoding='')
+		function serialize($charset_encoding = '')
 		{
 			if ($charset_encoding != '')
-				$this->content_type = 'text/xml; charset=' . $charset_encoding;
+				$this->content_type = 'text/xml; charset='.$charset_encoding;
 			else
 				$this->content_type = 'text/xml';
 			$result = "<methodResponse>\n";
-			if($this->errno)
+			if ($this->errno)
 			{
 				// G. Giunta 2005/2/13: let non-ASCII response messages be tolerated by clients
 				// by xml-encoding non ascii chars
-				$result .= "<fault>\n" .
-"<value>\n<struct><member><name>faultCode</name>\n<value><int>" . $this->errno .
-"</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>" .
-xmlrpc_encode_entitites($this->errstr, $GLOBALS['xmlrpc_internalencoding'], $charset_encoding) . "</string></value>\n</member>\n" .
+				$result .= "<fault>\n".
+"<value>\n<struct><member><name>faultCode</name>\n<value><int>".$this->errno.
+"</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>".
+xmlrpc_encode_entitites($this->errstr, $GLOBALS['xmlrpc_internalencoding'], $charset_encoding)."</string></value>\n</member>\n".
 "</struct>\n</value>\n</fault>";
 			}
 			else
 			{
-				if(!is_object($this->val) || !is_a($this->val, 'xmlrpcval'))
+				if (!is_object($this->val) || !is_a($this->val, 'xmlrpcval'))
 				{
 					if (is_string($this->val) && $this->valtyp == 'xml')
 					{
-						$result .= "<params>\n<param>\n" .
-							$this->val .
+						$result .= "<params>\n<param>\n".
+							$this->val.
 							"</param>\n</params>";
 					}
 					else
@@ -2068,8 +2068,8 @@ 
 				}
 				else
 				{
-					$result .= "<params>\n<param>\n" .
-						$this->val->serialize($charset_encoding) .
+					$result .= "<params>\n<param>\n".
+						$this->val->serialize($charset_encoding).
 						"</param>\n</params>";
 				}
 			}
@@ -2083,20 +2083,20 @@ 
 	{
 		var $payload;
 		var $methodname;
-		var $params=array();
-		var $debug=0;
+		var $params = array();
+		var $debug = 0;
 		var $content_type = 'text/xml';
 
 		/**
 		* @param string $meth the name of the method to invoke
 		* @param array $pars array of parameters to be paased to the method (xmlrpcval objects)
 		*/
-		function xmlrpcmsg($meth, $pars=0)
+		function xmlrpcmsg($meth, $pars = 0)
 		{
-			$this->methodname=$meth;
-			if(is_array($pars) && count($pars)>0)
+			$this->methodname = $meth;
+			if (is_array($pars) && count($pars) > 0)
 			{
-				for($i=0; $i<count($pars); $i++)
+				for ($i = 0; $i < count($pars); $i++)
 				{
 					$this->addParam($pars[$i]);
 				}
@@ -2106,15 +2106,15 @@ 
 		/**
 		* @access private
 		*/
-		function xml_header($charset_encoding='')
+		function xml_header($charset_encoding = '')
 		{
 			if ($charset_encoding != '')
 			{
-				return "<?xml version=\"1.0\" encoding=\"$charset_encoding\" ?" . ">\n<methodCall>\n";
+				return "<?xml version=\"1.0\" encoding=\"$charset_encoding\" ?".">\n<methodCall>\n";
 			}
 			else
 			{
-				return "<?xml version=\"1.0\"?" . ">\n<methodCall>\n";
+				return "<?xml version=\"1.0\"?".">\n<methodCall>\n";
 			}
 		}
 
@@ -2137,23 +2137,23 @@ 
 		/**
 		* @access private
 		*/
-		function createPayload($charset_encoding='')
+		function createPayload($charset_encoding = '')
 		{
 			if ($charset_encoding != '')
-				$this->content_type = 'text/xml; charset=' . $charset_encoding;
+				$this->content_type = 'text/xml; charset='.$charset_encoding;
 			else
 				$this->content_type = 'text/xml';
-			$this->payload=$this->xml_header($charset_encoding);
-			$this->payload.='<methodName>' . $this->methodname . "</methodName>\n";
-			$this->payload.="<params>\n";
-			for($i=0; $i<count($this->params); $i++)
+			$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++)
 			{
-				$p=$this->params[$i];
-				$this->payload.="<param>\n" . $p->serialize($charset_encoding) .
+				$p = $this->params[$i];
+				$this->payload .= "<param>\n".$p->serialize($charset_encoding).
 				"</param>\n";
 			}
-			$this->payload.="</params>\n";
-			$this->payload.=$this->xml_footer();
+			$this->payload .= "</params>\n";
+			$this->payload .= $this->xml_footer();
 		}
 
 		/**
@@ -2162,11 +2162,11 @@ 
 		* @return string the method that will be invoked
 		* @access public
 		*/
-		function method($meth='')
+		function method($meth = '')
 		{
-			if($meth!='')
+			if ($meth != '')
 			{
-				$this->methodname=$meth;
+				$this->methodname = $meth;
 			}
 			return $this->methodname;
 		}
@@ -2176,7 +2176,7 @@ 
 		* @return string the xml representation of the message, xml prologue included
 		* @access public
 		*/
-		function serialize($charset_encoding='')
+		function serialize($charset_encoding = '')
 		{
 			$this->createPayload($charset_encoding);
 			return $this->payload;
@@ -2191,9 +2191,9 @@ 
 		function addParam($par)
 		{
 			// add check: do not add to self params which are not xmlrpcvals
-			if(is_object($par) && is_a($par, 'xmlrpcval'))
+			if (is_object($par) && is_a($par, 'xmlrpcval'))
 			{
-				$this->params[]=$par;
+				$this->params[] = $par;
 				return true;
 			}
 			else
@@ -2231,13 +2231,13 @@ 
 		*/
 		function &parseResponseFile($fp)
 		{
-			$ipd='';
-			while($data=fread($fp, 32768))
+			$ipd = '';
+			while ($data = fread($fp, 32768))
 			{
-				$ipd.=$data;
+				$ipd .= $data;
 			}
 			//fclose($fp);
-			$r =& $this->parseResponse($ipd);
+			$r = & $this->parseResponse($ipd);
 			return $r;
 		}
 
@@ -2245,24 +2245,24 @@ 
 		* Parses HTTP headers and separates them from data.
 		* @access private
 		*/
-		function &parseResponseHeaders(&$data, $headers_processed=false)
+		function &parseResponseHeaders(&$data, $headers_processed = false)
 		{
 				// Support "web-proxy-tunelling" connections for https through proxies
-				if(preg_match('/^HTTP\/1\.[0-1] 200 Connection established/', $data))
+				if (preg_match('/^HTTP\/1\.[0-1] 200 Connection established/', $data))
 				{
 					// Look for CR/LF or simple LF as line separator,
 					// (even though it is not valid http)
-					$pos = strpos($data,"\r\n\r\n");
-					if($pos || is_int($pos))
+					$pos = strpos($data, "\r\n\r\n");
+					if ($pos || is_int($pos))
 					{
-						$bd = $pos+4;
+						$bd = $pos + 4;
 					}
 					else
 					{
-						$pos = strpos($data,"\n\n");
-						if($pos || is_int($pos))
+						$pos = strpos($data, "\n\n");
+						if ($pos || is_int($pos))
 						{
-							$bd = $pos+2;
+							$bd = $pos + 2;
 						}
 						else
 						{
@@ -2279,28 +2279,28 @@ 
 					else
 					{
 						error_log('XML-RPC: '.__METHOD__.': HTTPS via proxy error, tunnel connection possibly failed');
-						$r=new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['http_error'], $GLOBALS['xmlrpcstr']['http_error']. ' (HTTPS via proxy error, tunnel connection possibly failed)');
+						$r = new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['http_error'], $GLOBALS['xmlrpcstr']['http_error'].' (HTTPS via proxy error, tunnel connection possibly failed)');
 						return $r;
 					}
 				}
 
 				// Strip HTTP 1.1 100 Continue header if present
-				while(preg_match('/^HTTP\/1\.1 1[0-9]{2} /', $data))
+				while (preg_match('/^HTTP\/1\.1 1[0-9]{2} /', $data))
 				{
 					$pos = strpos($data, 'HTTP', 12);
 					// server sent a Continue header without any (valid) content following...
 					// give the client a chance to know it
-					if(!$pos && !is_int($pos)) // works fine in php 3, 4 and 5
+					if (!$pos && !is_int($pos)) // works fine in php 3, 4 and 5
 					{
 						break;
 					}
 					$data = substr($data, $pos);
 				}
-				if(!preg_match('/^HTTP\/[0-9.]+ 200 /', $data))
+				if (!preg_match('/^HTTP\/[0-9.]+ 200 /', $data))
 				{
-					$errstr= substr($data, 0, strpos($data, "\n")-1);
-					error_log('XML-RPC: '.__METHOD__.': HTTP error, got response: ' .$errstr);
-					$r=new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['http_error'], $GLOBALS['xmlrpcstr']['http_error']. ' (' . $errstr . ')');
+					$errstr = substr($data, 0, strpos($data, "\n") - 1);
+					error_log('XML-RPC: '.__METHOD__.': HTTP error, got response: '.$errstr);
+					$r = new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['http_error'], $GLOBALS['xmlrpcstr']['http_error'].' ('.$errstr.')');
 					return $r;
 				}
 
@@ -2309,17 +2309,17 @@ 
 
 				// be tolerant to usage of \n instead of \r\n to separate headers and data
 				// (even though it is not valid http)
-				$pos = strpos($data,"\r\n\r\n");
-				if($pos || is_int($pos))
+				$pos = strpos($data, "\r\n\r\n");
+				if ($pos || is_int($pos))
 				{
-					$bd = $pos+4;
+					$bd = $pos + 4;
 				}
 				else
 				{
-					$pos = strpos($data,"\n\n");
-					if($pos || is_int($pos))
+					$pos = strpos($data, "\n\n");
+					if ($pos || is_int($pos))
 					{
-						$bd = $pos+2;
+						$bd = $pos + 2;
 					}
 					else
 					{
@@ -2330,11 +2330,11 @@ 
 				}
 				// be tolerant to line endings, and extra empty lines
 				$ar = preg_split("/\r?\n/", trim(substr($data, 0, $pos)));
-				while(list(,$line) = @each($ar))
+				while (list(,$line) = @each($ar))
 				{
 					// take care of multi-line headers and cookies
-					$arr = explode(':',$line,2);
-					if(count($arr) > 1)
+					$arr = explode(':', $line, 2);
+					if (count($arr) > 1)
 					{
 						$header_name = strtolower(trim($arr[0]));
 						/// @todo some other headers (the ones that allow a CSV list of values)
@@ -2358,7 +2358,7 @@ 
 								// glue together all received cookies, using a comma to separate them
 								// (same as php does with getallheaders())
 								if (isset($GLOBALS['_xh']['headers'][$header_name]))
-									$GLOBALS['_xh']['headers'][$header_name] .= ', ' . trim($cookie);
+									$GLOBALS['_xh']['headers'][$header_name] .= ', '.trim($cookie);
 								else
 									$GLOBALS['_xh']['headers'][$header_name] = trim($cookie);
 								// parse cookie attributes, in case user wants to correctly honour them
@@ -2392,23 +2392,23 @@ 
 							$GLOBALS['_xh']['headers'][$header_name] = trim($arr[1]);
 						}
 					}
-					elseif(isset($header_name))
+					elseif (isset($header_name))
 					{
 						///	@todo version1 cookies might span multiple lines, thus breaking the parsing above
-						$GLOBALS['_xh']['headers'][$header_name] .= ' ' . trim($line);
+						$GLOBALS['_xh']['headers'][$header_name] .= ' '.trim($line);
 					}
 				}
 
 				$data = substr($data, $bd);
 
-				if($this->debug && count($GLOBALS['_xh']['headers']))
+				if ($this->debug && count($GLOBALS['_xh']['headers']))
 				{
 					print '<PRE>';
-					foreach($GLOBALS['_xh']['headers'] as $header => $value)
+					foreach ($GLOBALS['_xh']['headers'] as $header => $value)
 					{
 						print htmlentities("HEADER: $header: $value\n");
 					}
-					foreach($GLOBALS['_xh']['cookies'] as $header => $value)
+					foreach ($GLOBALS['_xh']['cookies'] as $header => $value)
 					{
 						print htmlentities("COOKIE: $header={$value['value']}\n");
 					}
@@ -2417,12 +2417,12 @@ 
 
 				// if CURL was used for the call, http headers have been processed,
 				// and dechunking + reinflating have been carried out
-				if(!$headers_processed)
+				if (!$headers_processed)
 				{
 					// Decode chunked encoding sent by http 1.1 servers
-					if(isset($GLOBALS['_xh']['headers']['transfer-encoding']) && $GLOBALS['_xh']['headers']['transfer-encoding'] == 'chunked')
+					if (isset($GLOBALS['_xh']['headers']['transfer-encoding']) && $GLOBALS['_xh']['headers']['transfer-encoding'] == 'chunked')
 					{
-						if(!$data = decode_chunked($data))
+						if (!$data = decode_chunked($data))
 						{
 							error_log('XML-RPC: '.__METHOD__.': errors occurred when trying to rebuild the chunked data received from server');
 							$r = new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['dechunk_fail'], $GLOBALS['xmlrpcstr']['dechunk_fail']);
@@ -2432,25 +2432,25 @@ 
 
 					// Decode gzip-compressed stuff
 					// code shamelessly inspired from nusoap library by Dietrich Ayala
-					if(isset($GLOBALS['_xh']['headers']['content-encoding']))
+					if (isset($GLOBALS['_xh']['headers']['content-encoding']))
 					{
 						$GLOBALS['_xh']['headers']['content-encoding'] = str_replace('x-', '', $GLOBALS['_xh']['headers']['content-encoding']);
-						if($GLOBALS['_xh']['headers']['content-encoding'] == 'deflate' || $GLOBALS['_xh']['headers']['content-encoding'] == 'gzip')
+						if ($GLOBALS['_xh']['headers']['content-encoding'] == 'deflate' || $GLOBALS['_xh']['headers']['content-encoding'] == 'gzip')
 						{
 							// if decoding works, use it. else assume data wasn't gzencoded
-							if(function_exists('gzinflate'))
+							if (function_exists('gzinflate'))
 							{
-								if($GLOBALS['_xh']['headers']['content-encoding'] == 'deflate' && $degzdata = @gzuncompress($data))
+								if ($GLOBALS['_xh']['headers']['content-encoding'] == 'deflate' && $degzdata = @gzuncompress($data))
 								{
 									$data = $degzdata;
-									if($this->debug)
-									print "<PRE>---INFLATED RESPONSE---[".strlen($data)." chars]---\n" . htmlentities($data) . "\n---END---</PRE>";
+									if ($this->debug)
+									print "<PRE>---INFLATED RESPONSE---[".strlen($data)." chars]---\n".htmlentities($data)."\n---END---</PRE>";
 								}
-								elseif($GLOBALS['_xh']['headers']['content-encoding'] == 'gzip' && $degzdata = @gzinflate(substr($data, 10)))
+								elseif ($GLOBALS['_xh']['headers']['content-encoding'] == 'gzip' && $degzdata = @gzinflate(substr($data, 10)))
 								{
 									$data = $degzdata;
-									if($this->debug)
-									print "<PRE>---INFLATED RESPONSE---[".strlen($data)." chars]---\n" . htmlentities($data) . "\n---END---</PRE>";
+									if ($this->debug)
+									print "<PRE>---INFLATED RESPONSE---[".strlen($data)." chars]---\n".htmlentities($data)."\n---END---</PRE>";
 								}
 								else
 								{
@@ -2471,7 +2471,7 @@ 
 
 				// real stupid hack to avoid PHP complaining about returning NULL by ref
 				$r = null;
-				$r =& $r;
+				$r = & $r;
 				return $r;
 		}
 
@@ -2483,28 +2483,28 @@ 
 		* @return xmlrpcresp
 		* @access public
 		*/
-		function &parseResponse($data='', $headers_processed=false, $return_type='xmlrpcvals')
+		function &parseResponse($data = '', $headers_processed = false, $return_type = 'xmlrpcvals')
 		{
-			if($this->debug)
+			if ($this->debug)
 			{
 				//by maHo, replaced htmlspecialchars with htmlentities
-				print "<PRE>---GOT---\n" . htmlentities($data) . "\n---END---\n</PRE>";
+				print "<PRE>---GOT---\n".htmlentities($data)."\n---END---\n</PRE>";
 			}
 
-			if($data == '')
+			if ($data == '')
 			{
 				error_log('XML-RPC: '.__METHOD__.': no response received from server.');
 				$r = new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['no_data'], $GLOBALS['xmlrpcstr']['no_data']);
 				return $r;
 			}
 
-			$GLOBALS['_xh']=array();
+			$GLOBALS['_xh'] = array();
 
 			$raw_data = $data;
 			// parse the HTTP headers of the response, if present, and separate them from data
-			if(substr($data, 0, 4) == 'HTTP')
+			if (substr($data, 0, 4) == 'HTTP')
 			{
-				$r =& $this->parseResponseHeaders($data, $headers_processed);
+				$r = & $this->parseResponseHeaders($data, $headers_processed);
 				if ($r)
 				{
 					// failed processing of HTTP response headers
@@ -2519,14 +2519,14 @@ 
 				$GLOBALS['_xh']['cookies'] = array();
 			}
 
-			if($this->debug)
+			if ($this->debug)
 			{
 				$start = strpos($data, '<!-- SERVER DEBUG INFO (BASE64 ENCODED):');
 				if ($start)
 				{
 					$start += strlen('<!-- SERVER DEBUG INFO (BASE64 ENCODED):');
 					$end = strpos($data, '-->', $start);
-					$comments = substr($data, $start, $end-$start);
+					$comments = substr($data, $start, $end - $start);
 					print "<PRE>---SERVER DEBUG INFO (DECODED) ---\n\t".htmlentities(str_replace("\n", "\n\t", base64_decode($comments)))."\n---END---\n</PRE>";
 				}
 			}
@@ -2539,9 +2539,9 @@ 
 			// 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);
+				$data = substr($data, 0, $pos + 17);
 			}
 
 			// if user wants back raw xml, give it to him
@@ -2557,13 +2557,13 @@ 
 			// try to 'guestimate' the character encoding of the received response
 			$resp_encoding = guess_encoding(@$GLOBALS['_xh']['headers']['content-type'], $data);
 
-			$GLOBALS['_xh']['ac']='';
+			$GLOBALS['_xh']['ac'] = '';
 			//$GLOBALS['_xh']['qt']=''; //unused...
 			$GLOBALS['_xh']['stack'] = array();
 			$GLOBALS['_xh']['valuestack'] = array();
-			$GLOBALS['_xh']['isf']=0; // 0 = OK, 1 for xmlrpc fault responses, 2 = invalid xmlrpc
-			$GLOBALS['_xh']['isf_reason']='';
-			$GLOBALS['_xh']['rt']=''; // 'methodcall or 'methodresponse'
+			$GLOBALS['_xh']['isf'] = 0; // 0 = OK, 1 for xmlrpc fault responses, 2 = invalid xmlrpc
+			$GLOBALS['_xh']['isf_reason'] = '';
+			$GLOBALS['_xh']['rt'] = ''; // 'methodcall or 'methodresponse'
 
 			// if response charset encoding is not known / supported, try to use
 			// the default encoding and parse the xml anyway, but log a warning...
@@ -2605,10 +2605,10 @@ 
 			xml_set_default_handler($parser, 'xmlrpc_dh');
 
 			// first error check: xml not well formed
-			if(!xml_parse($parser, $data, count($data)))
+			if (!xml_parse($parser, $data, count($data)))
 			{
 				// thanks to Peter Kocks <peter.kocks@baygate.com>
-				if((xml_get_current_line_number($parser)) == 1)
+				if ((xml_get_current_line_number($parser)) == 1)
 				{
 					$errstr = 'XML error at line 1, check URL';
 				}
@@ -2619,9 +2619,9 @@ 
 						xml_get_current_line_number($parser), xml_get_current_column_number($parser));
 				}
 				error_log($errstr);
-				$r=new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['invalid_return'], $GLOBALS['xmlrpcstr']['invalid_return'].' ('.$errstr.')');
+				$r = new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['invalid_return'], $GLOBALS['xmlrpcstr']['invalid_return'].' ('.$errstr.')');
 				xml_parser_free($parser);
-				if($this->debug)
+				if ($this->debug)
 				{
 					print $errstr;
 				}
@@ -2640,7 +2640,7 @@ 
 				}
 
 				$r = new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['invalid_return'],
-				$GLOBALS['xmlrpcstr']['invalid_return'] . ' ' . $GLOBALS['_xh']['isf_reason']);
+				$GLOBALS['xmlrpcstr']['invalid_return'].' '.$GLOBALS['_xh']['isf_reason']);
 			}
 			// third error check: parsing of the response has somehow gone boink.
 			// NB: shall we omit this check, since we trust the parsing code?
@@ -2649,7 +2649,7 @@ 
 				// something odd has happened
 				// and it's time to generate a client side error
 				// indicating something odd went on
-				$r=new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['invalid_return'],
+				$r = new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['invalid_return'],
 					$GLOBALS['xmlrpcstr']['invalid_return']);
 			}
 			else
@@ -2664,9 +2664,9 @@ 
 				}
 
 				// note that using =& will raise an error if $GLOBALS['_xh']['st'] does not generate an object.
-				$v =& $GLOBALS['_xh']['value'];
+				$v = & $GLOBALS['_xh']['value'];
 
-				if($GLOBALS['_xh']['isf'])
+				if ($GLOBALS['_xh']['isf'])
 				{
 					/// @todo we should test here if server sent an int and a string,
 					/// and/or coerce them into such...
@@ -2683,7 +2683,7 @@ 
 						$errstr = $v['faultString'];
 					}
 
-					if($errno == 0)
+					if ($errno == 0)
 					{
 						// FAULT returned, errno needs to reflect that
 						$errno = -1;
@@ -2693,7 +2693,7 @@ 
 				}
 				else
 				{
-					$r=new xmlrpcresp($v, 0, '', $return_type);
+					$r = new xmlrpcresp($v, 0, '', $return_type);
 				}
 			}
 
@@ -2706,26 +2706,26 @@ 
 
 	class xmlrpcval
 	{
-		var $me=array();
-		var $mytype=0;
-		var $_php_class=null;
+		var $me = array();
+		var $mytype = 0;
+		var $_php_class = null;
 
 		/**
 		* @param mixed $val
 		* @param string $type any valid xmlrpc type name (lowercase). If null, 'string' is assumed
 		*/
-		function xmlrpcval($val=-1, $type='')
+		function xmlrpcval($val = -1, $type = '')
 		{
 			/// @todo: optimization creep - do not call addXX, do it all inline.
 			/// downside: booleans will not be coerced anymore
-			if($val!==-1 || $type!='')
+			if ($val !== -1 || $type != '')
 			{
 				// optimization creep: inlined all work done by constructor
-				switch($type)
+				switch ($type)
 				{
 					case '':
-						$this->mytype=1;
-						$this->me['string']=$val;
+						$this->mytype = 1;
+						$this->me['string'] = $val;
 						break;
 					case 'i4':
 					case 'int':
@@ -2735,16 +2735,16 @@ 
 					case 'dateTime.iso8601':
 					case 'base64':
 					case 'null':
-						$this->mytype=1;
-						$this->me[$type]=$val;
+						$this->mytype = 1;
+						$this->me[$type] = $val;
 						break;
 					case 'array':
-						$this->mytype=2;
-						$this->me['array']=$val;
+						$this->mytype = 2;
+						$this->me['array'] = $val;
 						break;
 					case 'struct':
-						$this->mytype=3;
-						$this->me['struct']=$val;
+						$this->mytype = 3;
+						$this->me['struct'] = $val;
 						break;
 					default:
 						error_log("XML-RPC: ".__METHOD__.": not a known type ($type)");
@@ -2774,10 +2774,10 @@ 
 		* @param string $type
 		* @return int 1 or 0 on failure
 		*/
-		function addScalar($val, $type='string')
+		function addScalar($val, $type = 'string')
 		{
-			$typeof=@$GLOBALS['xmlrpcTypes'][$type];
-			if($typeof!=1)
+			$typeof = @$GLOBALS['xmlrpcTypes'][$type];
+			if ($typeof != 1)
 			{
 				error_log("XML-RPC: ".__METHOD__.": not a scalar type ($type)");
 				return 0;
@@ -2786,19 +2786,19 @@ 
 			// coerce booleans into correct values
 			// NB: we should either do it for datetimes, integers and doubles, too,
 			// or just plain remove this check, implemented on booleans only...
-			if($type==$GLOBALS['xmlrpcBoolean'])
+			if ($type == $GLOBALS['xmlrpcBoolean'])
 			{
-				if(strcasecmp($val,'true')==0 || $val==1 || ($val==true && strcasecmp($val,'false')))
+				if (strcasecmp($val, 'true') == 0 || $val == 1 || ($val == true && strcasecmp($val, 'false')))
 				{
-					$val=true;
+					$val = true;
 				}
 				else
 				{
-					$val=false;
+					$val = false;
 				}
 			}
 
-			switch($this->mytype)
+			switch ($this->mytype)
 			{
 				case 1:
 					error_log('XML-RPC: '.__METHOD__.': scalar xmlrpcval can have only one value');
@@ -2812,12 +2812,12 @@ 
 					//$ar[]=new xmlrpcval($val, $type);
 					//$this->me['array']=$ar;
 					// Faster (?) avoid all the costly array-copy-by-val done here...
-					$this->me['array'][]=new xmlrpcval($val, $type);
+					$this->me['array'][] = new xmlrpcval($val, $type);
 					return 1;
 				default:
 					// a scalar, so set the value and remember we're scalar
-					$this->me[$type]=$val;
-					$this->mytype=$typeof;
+					$this->me[$type] = $val;
+					$this->mytype = $typeof;
 					return 1;
 			}
 		}
@@ -2832,13 +2832,13 @@ 
 		*/
 		function addArray($vals)
 		{
-			if($this->mytype==0)
+			if ($this->mytype == 0)
 			{
-				$this->mytype=$GLOBALS['xmlrpcTypes']['array'];
-				$this->me['array']=$vals;
+				$this->mytype = $GLOBALS['xmlrpcTypes']['array'];
+				$this->me['array'] = $vals;
 				return 1;
 			}
-			elseif($this->mytype==2)
+			elseif ($this->mytype == 2)
 			{
 				// we're adding to an array here
 				$this->me['array'] = array_merge($this->me['array'], $vals);
@@ -2846,7 +2846,7 @@ 
 			}
 			else
 			{
-				error_log('XML-RPC: '.__METHOD__.': already initialized as a [' . $this->kindOf() . ']');
+				error_log('XML-RPC: '.__METHOD__.': already initialized as a ['.$this->kindOf().']');
 				return 0;
 			}
 		}
@@ -2861,13 +2861,13 @@ 
 		*/
 		function addStruct($vals)
 		{
-			if($this->mytype==0)
+			if ($this->mytype == 0)
 			{
-				$this->mytype=$GLOBALS['xmlrpcTypes']['struct'];
-				$this->me['struct']=$vals;
+				$this->mytype = $GLOBALS['xmlrpcTypes']['struct'];
+				$this->me['struct'] = $vals;
 				return 1;
 			}
-			elseif($this->mytype==3)
+			elseif ($this->mytype == 3)
 			{
 				// we're adding to a struct here
 				$this->me['struct'] = array_merge($this->me['struct'], $vals);
@@ -2875,7 +2875,7 @@ 
 			}
 			else
 			{
-				error_log('XML-RPC: '.__METHOD__.': already initialized as a [' . $this->kindOf() . ']');
+				error_log('XML-RPC: '.__METHOD__.': already initialized as a ['.$this->kindOf().']');
 				return 0;
 			}
 		}
@@ -2884,12 +2884,12 @@ 
 		// DEPRECATED!
 		function dump($ar)
 		{
-			foreach($ar as $key => $val)
+			foreach ($ar as $key => $val)
 			{
 				echo "$key => $val<br />";
-				if($key == 'array')
+				if ($key == 'array')
 				{
-					while(list($key2, $val2) = each($val))
+					while (list($key2, $val2) = each($val))
 					{
 						echo "-- $key2 => $val2<br />";
 					}
@@ -2904,7 +2904,7 @@ 
 		*/
 		function kindOf()
 		{
-			switch($this->mytype)
+			switch ($this->mytype)
 			{
 				case 3:
 					return 'struct';
@@ -2923,28 +2923,28 @@ 
 		/**
 		* @access private
 		*/
-		function serializedata($typ, $val, $charset_encoding='')
+		function serializedata($typ, $val, $charset_encoding = '')
 		{
-			$rs='';
-			switch(@$GLOBALS['xmlrpcTypes'][$typ])
+			$rs = '';
+			switch (@$GLOBALS['xmlrpcTypes'][$typ])
 			{
 				case 1:
-					switch($typ)
+					switch ($typ)
 					{
 						case $GLOBALS['xmlrpcBase64']:
-							$rs.="<${typ}>" . base64_encode($val) . "</${typ}>";
+							$rs .= "<${typ}>".base64_encode($val)."</${typ}>";
 							break;
 						case $GLOBALS['xmlrpcBoolean']:
-							$rs.="<${typ}>" . ($val ? '1' : '0') . "</${typ}>";
+							$rs .= "<${typ}>".($val ? '1' : '0')."</${typ}>";
 							break;
 						case $GLOBALS['xmlrpcString']:
 							// G. Giunta 2005/2/13: do NOT use htmlentities, since
 							// it will produce named html entities, which are invalid xml
-							$rs.="<${typ}>" . xmlrpc_encode_entitites($val, $GLOBALS['xmlrpc_internalencoding'], $charset_encoding). "</${typ}>";
+							$rs .= "<${typ}>".xmlrpc_encode_entitites($val, $GLOBALS['xmlrpc_internalencoding'], $charset_encoding)."</${typ}>";
 							break;
 						case $GLOBALS['xmlrpcInt']:
 						case $GLOBALS['xmlrpcI4']:
-							$rs.="<${typ}>".(int)$val."</${typ}>";
+							$rs .= "<${typ}>".(int) $val."</${typ}>";
 							break;
 						case $GLOBALS['xmlrpcDouble']:
 							// avoid using standard conversion of float to string because it is locale-dependent,
@@ -2952,71 +2952,71 @@ 
 							// sprintf('%F') could be most likely ok but it fails eg. on 2e-14.
 							// The code below tries its best at keeping max precision while avoiding exp notation,
 							// but there is of course no limit in the number of decimal places to be used...
-							$rs.="<${typ}>".preg_replace('/\\.?0+$/','',number_format((double)$val, 128, '.', ''))."</${typ}>";
+							$rs .= "<${typ}>".preg_replace('/\\.?0+$/', '', number_format((double) $val, 128, '.', ''))."</${typ}>";
 							break;
 						case $GLOBALS['xmlrpcDateTime']:
 							if (is_string($val))
 							{
-								$rs.="<${typ}>${val}</${typ}>";
+								$rs .= "<${typ}>${val}</${typ}>";
 							}
-							else if(is_a($val, 'DateTime'))
+							else if (is_a($val, 'DateTime'))
 							{
-								$rs.="<${typ}>".$val->format('Ymd\TH:i:s')."</${typ}>";
+								$rs .= "<${typ}>".$val->format('Ymd\TH:i:s')."</${typ}>";
 							}
-							else if(is_int($val))
+							else if (is_int($val))
 							{
-								$rs.="<${typ}>".strftime("%Y%m%dT%H:%M:%S", $val)."</${typ}>";
+								$rs .= "<${typ}>".strftime("%Y%m%dT%H:%M:%S", $val)."</${typ}>";
 							}
 							else
 							{
 								// not really a good idea here: but what shall we output anyway? left for backward compat...
-								$rs.="<${typ}>${val}</${typ}>";
+								$rs .= "<${typ}>${val}</${typ}>";
 							}
 							break;
 						case $GLOBALS['xmlrpcNull']:
 							if ($GLOBALS['xmlrpc_null_apache_encoding'])
 							{
-								$rs.="<ex:nil/>";
+								$rs .= "<ex:nil/>";
 							}
 							else
 							{
-								$rs.="<nil/>";
+								$rs .= "<nil/>";
 							}
 							break;
 						default:
 							// no standard type value should arrive here, but provide a possibility
 							// for xmlrpcvals of unknown type...
-							$rs.="<${typ}>${val}</${typ}>";
+							$rs .= "<${typ}>${val}</${typ}>";
 					}
 					break;
 				case 3:
 					// struct
 					if ($this->_php_class)
 					{
-						$rs.='<struct php_class="' . $this->_php_class . "\">\n";
+						$rs .= '<struct php_class="'.$this->_php_class."\">\n";
 					}
 					else
 					{
-						$rs.="<struct>\n";
+						$rs .= "<struct>\n";
 					}
-					foreach($val as $key2 => $val2)
+					foreach ($val as $key2 => $val2)
 					{
-						$rs.='<member><name>'.xmlrpc_encode_entitites($key2, $GLOBALS['xmlrpc_internalencoding'], $charset_encoding)."</name>\n";
+						$rs .= '<member><name>'.xmlrpc_encode_entitites($key2, $GLOBALS['xmlrpc_internalencoding'], $charset_encoding)."</name>\n";
 						//$rs.=$this->serializeval($val2);
-						$rs.=$val2->serialize($charset_encoding);
-						$rs.="</member>\n";
+						$rs .= $val2->serialize($charset_encoding);
+						$rs .= "</member>\n";
 					}
-					$rs.='</struct>';
+					$rs .= '</struct>';
 					break;
 				case 2:
 					// array
-					$rs.="<array>\n<data>\n";
-					for($i=0; $i<count($val); $i++)
+					$rs .= "<array>\n<data>\n";
+					for ($i = 0; $i < count($val); $i++)
 					{
 						//$rs.=$this->serializeval($val[$i]);
-						$rs.=$val[$i]->serialize($charset_encoding);
+						$rs .= $val[$i]->serialize($charset_encoding);
 					}
-					$rs.="</data>\n</array>";
+					$rs .= "</data>\n</array>";
 					break;
 				default:
 					break;
@@ -3030,14 +3030,14 @@ 
 		* @return string
 		* @access public
 		*/
-		function serialize($charset_encoding='')
+		function serialize($charset_encoding = '')
 		{
 			// add check? slower, but helps to avoid recursion in serializing broken xmlrpcvals...
 			//if (is_object($o) && (get_class($o) == 'xmlrpcval' || is_subclass_of($o, 'xmlrpcval')))
 			//{
 				reset($this->me);
 				list($typ, $val) = each($this->me);
-				return '<value>' . $this->serializedata($typ, $val, $charset_encoding) . "</value>\n";
+				return '<value>'.$this->serializedata($typ, $val, $charset_encoding)."</value>\n";
 			//}
 		}
 
@@ -3047,10 +3047,10 @@ 
 			// add check? slower, but helps to avoid recursion in serializing broken xmlrpcvals...
 			//if (is_object($o) && (get_class($o) == 'xmlrpcval' || is_subclass_of($o, 'xmlrpcval')))
 			//{
-				$ar=$o->me;
+				$ar = $o->me;
 				reset($ar);
 				list($typ, $val) = each($ar);
-				return '<value>' . $this->serializedata($typ, $val) . "</value>\n";
+				return '<value>'.$this->serializedata($typ, $val)."</value>\n";
 			//}
 		}
 
@@ -3103,32 +3103,32 @@ 
 		{
 			// UNSTABLE
 			reset($this->me);
-			list($a,$b)=each($this->me);
+			list($a, $b) = each($this->me);
 			// contributed by I Sofer, 2001-03-24
 			// add support for nested arrays to scalarval
 			// i've created a new method here, so as to
 			// preserve back compatibility
 
-			if(is_array($b))
+			if (is_array($b))
 			{
 				@reset($b);
-				while(list($id,$cont) = @each($b))
+				while (list($id, $cont) = @each($b))
 				{
 					$b[$id] = $cont->scalarval();
 				}
 			}
 
 			// add support for structures directly encoding php objects
-			if(is_object($b))
+			if (is_object($b))
 			{
 				$t = get_object_vars($b);
 				@reset($t);
-				while(list($id,$cont) = @each($t))
+				while (list($id, $cont) = @each($t))
 				{
 					$t[$id] = $cont->scalarval();
 				}
 				@reset($t);
-				while(list($id,$cont) = @each($t))
+				while (list($id, $cont) = @each($t))
 				{
 					@$b->$id = $cont;
 				}
@@ -3145,7 +3145,7 @@ 
 		function scalarval()
 		{
 			reset($this->me);
-			list(,$b)=each($this->me);
+			list(,$b) = each($this->me);
 			return $b;
 		}
 
@@ -3158,10 +3158,10 @@ 
 		function scalartyp()
 		{
 			reset($this->me);
-			list($a,)=each($this->me);
-			if($a==$GLOBALS['xmlrpcI4'])
+			list($a,) = each($this->me);
+			if ($a == $GLOBALS['xmlrpcI4'])
 			{
-				$a=$GLOBALS['xmlrpcInt'];
+				$a = $GLOBALS['xmlrpcInt'];
 			}
 			return $a;
 		}
@@ -3218,23 +3218,23 @@ 
 	* @param int $utc (0 or 1)
 	* @return string
 	*/
-	function iso8601_encode($timet, $utc=0)
+	function iso8601_encode($timet, $utc = 0)
 	{
-		if(!$utc)
+		if (!$utc)
 		{
-			$t=strftime("%Y%m%dT%H:%M:%S", $timet);
+			$t = strftime("%Y%m%dT%H:%M:%S", $timet);
 		}
 		else
 		{
-			if(function_exists('gmstrftime'))
+			if (function_exists('gmstrftime'))
 			{
 				// gmstrftime doesn't exist in some versions
 				// of PHP
-				$t=gmstrftime("%Y%m%dT%H:%M:%S", $timet);
+				$t = gmstrftime("%Y%m%dT%H:%M:%S", $timet);
 			}
 			else
 			{
-				$t=strftime("%Y%m%dT%H:%M:%S", $timet-date('Z'));
+				$t = strftime("%Y%m%dT%H:%M:%S", $timet - date('Z'));
 			}
 		}
 		return $t;
@@ -3246,18 +3246,18 @@ 
 	* @param int $utc either 0 or 1
 	* @return int (datetime)
 	*/
-	function iso8601_decode($idate, $utc=0)
+	function iso8601_decode($idate, $utc = 0)
 	{
-		$t=0;
-		if(preg_match('/([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})/', $idate, $regs))
+		$t = 0;
+		if (preg_match('/([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})/', $idate, $regs))
 		{
-			if($utc)
+			if ($utc)
 			{
-				$t=gmmktime($regs[4], $regs[5], $regs[6], $regs[2], $regs[3], $regs[1]);
+				$t = gmmktime($regs[4], $regs[5], $regs[6], $regs[2], $regs[3], $regs[1]);
 			}
 			else
 			{
-				$t=mktime($regs[4], $regs[5], $regs[6], $regs[2], $regs[3], $regs[1]);
+				$t = mktime($regs[4], $regs[5], $regs[6], $regs[2], $regs[3], $regs[1]);
 			}
 		}
 		return $t;
@@ -3284,15 +3284,15 @@ 
 	* @param array $options if 'decode_php_objs' is set in the options array, xmlrpc structs can be decoded into php objects; if 'dates_as_objects' is set xmlrpc datetimes are decoded as php DateTime objects (standard is
 	* @return mixed
 	*/
-	function php_xmlrpc_decode($xmlrpc_val, $options=array())
+	function php_xmlrpc_decode($xmlrpc_val, $options = array())
 	{
-		switch($xmlrpc_val->kindOf())
+		switch ($xmlrpc_val->kindOf())
 		{
 			case 'scalar':
 				if (in_array('extension_api', $options))
 				{
 					reset($xmlrpc_val->me);
-					list($typ,$val) = each($xmlrpc_val->me);
+					list($typ, $val) = each($xmlrpc_val->me);
 					switch ($typ)
 					{
 						case 'dateTime.iso8601':
@@ -3333,7 +3333,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);
 				}
@@ -3348,7 +3348,7 @@ 
 					&& class_exists($xmlrpc_val->_php_class))
 				{
 					$obj = @new $xmlrpc_val->_php_class;
-					while(list($key,$value)=$xmlrpc_val->structeach())
+					while (list($key, $value) = $xmlrpc_val->structeach())
 					{
 						$obj->$key = php_xmlrpc_decode($value, $options);
 					}
@@ -3357,7 +3357,7 @@ 
 				else
 				{
 					$arr = array();
-					while(list($key,$value)=$xmlrpc_val->structeach())
+					while (list($key, $value) = $xmlrpc_val->structeach())
 					{
 						$arr[$key] = php_xmlrpc_decode($value, $options);
 					}
@@ -3366,7 +3366,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));
 				}
@@ -3377,13 +3377,13 @@ 
 	// This constant left here only for historical reasons...
 	// it was used to decide if we have to define xmlrpc_encode on our own, but
 	// we do not do it anymore
-	if(function_exists('xmlrpc_decode'))
+	if (function_exists('xmlrpc_decode'))
 	{
-		define('XMLRPC_EPI_ENABLED','1');
+		define('XMLRPC_EPI_ENABLED', '1');
 	}
 	else
 	{
-		define('XMLRPC_EPI_ENABLED','0');
+		define('XMLRPC_EPI_ENABLED', '0');
 	}
 
 	/**
@@ -3403,10 +3403,10 @@ 
 	* @param array $options	can include 'encode_php_objs', 'auto_dates', 'null_extension' or 'extension_api'
 	* @return xmlrpcval
 	*/
-	function php_xmlrpc_encode($php_val, $options=array())
+	function php_xmlrpc_encode($php_val, $options = array())
 	{
 		$type = gettype($php_val);
-		switch($type)
+		switch ($type)
 		{
 			case 'string':
 				if (in_array('auto_dates', $options) && preg_match('/^[0-9]{8}T[0-9]{2}:[0-9]{2}:[0-9]{2}$/', $php_val))
@@ -3435,16 +3435,16 @@ 
 				$j = 0;
 				$arr = array();
 				$ko = false;
-				foreach($php_val as $key => $val)
+				foreach ($php_val as $key => $val)
 				{
 					$arr[$key] = php_xmlrpc_encode($val, $options);
-					if(!$ko && $key !== $j)
+					if (!$ko && $key !== $j)
 					{
 						$ko = true;
 					}
 					$j++;
 				}
-				if($ko)
+				if ($ko)
 				{
 					$xmlrpc_val = new xmlrpcval($arr, $GLOBALS['xmlrpcStruct']);
 				}
@@ -3454,11 +3454,11 @@ 
 				}
 				break;
 			case 'object':
-				if(is_a($php_val, 'xmlrpcval'))
+				if (is_a($php_val, 'xmlrpcval'))
 				{
 					$xmlrpc_val = $php_val;
 				}
-				else if(is_a($php_val, 'DateTime'))
+				else if (is_a($php_val, 'DateTime'))
 				{
 					$xmlrpc_val = new xmlrpcval($php_val->format('Ymd\TH:i:s'), $GLOBALS['xmlrpcStruct']);
 				}
@@ -3466,7 +3466,7 @@ 
 				{
 					$arr = array();
 					reset($php_val);
-					while(list($k,$v) = each($php_val))
+					while (list($k, $v) = each($php_val))
 					{
 						$arr[$k] = php_xmlrpc_encode($v, $options);
 					}
@@ -3496,7 +3496,7 @@ 
 			case 'resource':
 				if (in_array('extension_api', $options))
 				{
-					$xmlrpc_val = new xmlrpcval((int)$php_val, $GLOBALS['xmlrpcInt']);
+					$xmlrpc_val = new xmlrpcval((int) $php_val, $GLOBALS['xmlrpcInt']);
 				}
 				else
 				{
@@ -3520,7 +3520,7 @@ 
 	* @param array $options
 	* @return mixed false on error, or an instance of either xmlrpcval, xmlrpcmsg or xmlrpcresp
 	*/
-	function php_xmlrpc_decode_xml($xml_val, $options=array())
+	function php_xmlrpc_decode_xml($xml_val, $options = array())
 	{
 		$GLOBALS['_xh'] = array();
 		$GLOBALS['_xh']['ac'] = '';
@@ -3548,7 +3548,7 @@ 
 		xml_set_element_handler($parser, 'xmlrpc_se_any', 'xmlrpc_ee');
 		xml_set_character_data_handler($parser, 'xmlrpc_cd');
 		xml_set_default_handler($parser, 'xmlrpc_dh');
-		if(!xml_parse($parser, $xml_val, 1))
+		if (!xml_parse($parser, $xml_val, 1))
 		{
 			$errstr = sprintf('XML error: %s at line %d, column %d',
 						xml_error_string(xml_get_error_code($parser)),
@@ -3566,7 +3566,7 @@ 
 		switch ($GLOBALS['_xh']['rt'])
 		{
 			case 'methodresponse':
-				$v =& $GLOBALS['_xh']['value'];
+				$v = & $GLOBALS['_xh']['value'];
 				if ($GLOBALS['_xh']['isf'] == 1)
 				{
 					$vc = $v->structmem('faultCode');
@@ -3580,7 +3580,7 @@ 
 				return $r;
 			case 'methodcall':
 				$m = new xmlrpcmsg($GLOBALS['_xh']['method']);
-				for($i=0; $i < count($GLOBALS['_xh']['params']); $i++)
+				for ($i = 0; $i < count($GLOBALS['_xh']['params']); $i++)
 				{
 					$m->addParam($GLOBALS['_xh']['params'][$i]);
 				}
@@ -3608,18 +3608,18 @@ 
 
 		// read chunk-size, chunk-extension (if any) and crlf
 		// get the position of the linebreak
-		$chunkend = strpos($buffer,"\r\n") + 2;
-		$temp = substr($buffer,0,$chunkend);
-		$chunk_size = hexdec( trim($temp) );
+		$chunkend = strpos($buffer, "\r\n") + 2;
+		$temp = substr($buffer, 0, $chunkend);
+		$chunk_size = hexdec(trim($temp));
 		$chunkstart = $chunkend;
-		while($chunk_size > 0)
+		while ($chunk_size > 0)
 		{
 			$chunkend = strpos($buffer, "\r\n", $chunkstart + $chunk_size);
 
 			// just in case we got a broken connection
-			if($chunkend == false)
+			if ($chunkend == false)
 			{
-				$chunk = substr($buffer,$chunkstart);
+				$chunk = substr($buffer, $chunkstart);
 				// append chunk-data to entity-body
 				$new .= $chunk;
 				$length += strlen($chunk);
@@ -3627,7 +3627,7 @@ 
 			}
 
 			// read chunk-data and crlf
-			$chunk = substr($buffer,$chunkstart,$chunkend-$chunkstart);
+			$chunk = substr($buffer, $chunkstart, $chunkend - $chunkstart);
 			// append chunk-data to entity-body
 			$new .= $chunk;
 			// length := length + chunk-size
@@ -3635,13 +3635,13 @@ 
 			// read chunk-size and crlf
 			$chunkstart = $chunkend + 2;
 
-			$chunkend = strpos($buffer,"\r\n",$chunkstart)+2;
-			if($chunkend == false)
+			$chunkend = strpos($buffer, "\r\n", $chunkstart) + 2;
+			if ($chunkend == false)
 			{
 				break; //just in case we got a broken connection
 			}
-			$temp = substr($buffer,$chunkstart,$chunkend-$chunkstart);
-			$chunk_size = hexdec( trim($temp) );
+			$temp = substr($buffer, $chunkstart, $chunkend - $chunkstart);
+			$chunk_size = hexdec(trim($temp));
 			$chunkstart = $chunkend;
 		}
 		return $new;
@@ -3660,7 +3660,7 @@ 
 	*
 	* @todo explore usage of mb_http_input(): does it detect http headers + post data? if so, use it instead of hand-detection!!!
 	*/
-	function guess_encoding($httpheader='', $xmlchunk='', $encoding_prefs=null)
+	function guess_encoding($httpheader = '', $xmlchunk = '', $encoding_prefs = null)
 	{
 		// discussion: see http://www.yale.edu/pclt/encoding/
 		// 1 - test if encoding is specified in HTTP HEADERS
@@ -3678,7 +3678,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,15 +3690,15 @@ 
 		//     in the xml declaration, and verify if they match.
 		/// @todo implement check as described above?
 		/// @todo implement check for first bytes of string even without a BOM? (It sure looks harder than for cases WITH a BOM)
-		if(preg_match('/^(\x00\x00\xFE\xFF|\xFF\xFE\x00\x00|\x00\x00\xFF\xFE|\xFE\xFF\x00\x00)/', $xmlchunk))
+		if (preg_match('/^(\x00\x00\xFE\xFF|\xFF\xFE\x00\x00|\x00\x00\xFF\xFE|\xFE\xFF\x00\x00)/', $xmlchunk))
 		{
 			return 'UCS-4';
 		}
-		elseif(preg_match('/^(\xFE\xFF|\xFF\xFE)/', $xmlchunk))
+		elseif (preg_match('/^(\xFE\xFF|\xFF\xFE)/', $xmlchunk))
 		{
 			return 'UTF-16';
 		}
-		elseif(preg_match('/^(\xEF\xBB\xBF)/', $xmlchunk))
+		elseif (preg_match('/^(\xEF\xBB\xBF)/', $xmlchunk))
 		{
 			return 'UTF-8';
 		}
@@ -3707,8 +3707,8 @@ 
 		// Details:
 		// SPACE:         (#x20 | #x9 | #xD | #xA)+ === [ \x9\xD\xA]+
 		// EQ:            SPACE?=SPACE? === [ \x9\xD\xA]*=[ \x9\xD\xA]*
-		if (preg_match('/^<\?xml\s+version\s*=\s*'. "((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))".
-			'\s+encoding\s*=\s*' . "((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/",
+		if (preg_match('/^<\?xml\s+version\s*=\s*'."((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))".
+			'\s+encoding\s*=\s*'."((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/",
 			$xmlchunk, $matches))
 		{
 			return strtoupper(substr($matches[2], 1, -1));
@@ -3716,9 +3716,9 @@ 
 
 		// 4 - if mbstring is available, let it do the guesswork
 		// NB: we favour finding an encoding that is compatible with what we can process
-		if(extension_loaded('mbstring'))
+		if (extension_loaded('mbstring'))
 		{
-			if($encoding_prefs)
+			if ($encoding_prefs)
 			{
 				$enc = mb_detect_encoding($xmlchunk, $encoding_prefs);
 			}
@@ -3728,7 +3728,7 @@ 
 			}
 			// NB: mb_detect likes to call it ascii, xml parser likes to call it US_ASCII...
 			// IANA also likes better US-ASCII, so go with it
-			if($enc == 'ASCII')
+			if ($enc == 'ASCII')
 			{
 				$enc = 'US-'.$enc;
 			}
@@ -3753,7 +3753,7 @@ 
 	function is_valid_charset($encoding, $validlist)
 	{
 		$charset_supersets = array(
-			'US-ASCII' => array ('ISO-8859-1', 'ISO-8859-2', 'ISO-8859-3', 'ISO-8859-4',
+			'US-ASCII' => array('ISO-8859-1', 'ISO-8859-2', 'ISO-8859-3', 'ISO-8859-4',
 				'ISO-8859-5', 'ISO-8859-6', 'ISO-8859-7', 'ISO-8859-8',
 				'ISO-8859-9', 'ISO-8859-10', 'ISO-8859-11', 'ISO-8859-12',
 				'ISO-8859-13', 'ISO-8859-14', 'ISO-8859-15', 'UTF-8',

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

Spacing +95 added lines, -95 removed lines

@@ -28,7 +28,7 @@ 
 	*/
 	function php_2_xmlrpc_type($phptype)
 	{
-		switch(strtolower($phptype))
+		switch (strtolower($phptype))
 		{
 			case 'string':
 				return $GLOBALS['xmlrpcString'];
@@ -50,7 +50,7 @@ 
 			case 'resource':
 				return '';
 			default:
-				if(class_exists($phptype))
+				if (class_exists($phptype))
 				{
 					return $GLOBALS['xmlrpcStruct'];
 				}
@@ -69,7 +69,7 @@ 
 	*/
 	function xmlrpc_2_php_type($xmlrpctype)
 	{
-		switch(strtolower($xmlrpctype))
+		switch (strtolower($xmlrpctype))
 		{
 			case 'base64':
 			case 'datetime.iso8601':
@@ -142,15 +142,15 @@ 
 	* @todo if $newfuncname is empty, we could use create_user_func instead of eval, as it is possibly faster
 	* @todo add a verbatim_object_copy parameter to allow avoiding the same obj instance?
 	*/
-	function wrap_php_function($funcname, $newfuncname='', $extra_options=array())
+	function wrap_php_function($funcname, $newfuncname = '', $extra_options = array())
 	{
 		$buildit = isset($extra_options['return_source']) ? !($extra_options['return_source']) : true;
 		$prefix = isset($extra_options['prefix']) ? $extra_options['prefix'] : 'xmlrpc';
-		$encode_php_objects = isset($extra_options['encode_php_objs']) ? (bool)$extra_options['encode_php_objs'] : false;
-		$decode_php_objects = isset($extra_options['decode_php_objs']) ? (bool)$extra_options['decode_php_objs'] : false;
+		$encode_php_objects = isset($extra_options['encode_php_objs']) ? (bool) $extra_options['encode_php_objs'] : false;
+		$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');
@@ -162,26 +162,26 @@ 
 	    {
 	        $funcname = explode('::', $funcname);
 	    }
-        if(is_array($funcname))
+        if (is_array($funcname))
         {
-            if(count($funcname) < 2 || (!is_string($funcname[0]) && !is_object($funcname[0])))
+            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];
+                $plainfuncname = get_class($funcname[0]).'->'.$funcname[1];
             }
             $exists = method_exists($funcname[0], $funcname[1]);
             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 );
+               $exists = is_callable($funcname);
             }
         }
         else
@@ -190,7 +190,7 @@ 
             $exists = function_exists($funcname);
         }
 
-		if(!$exists)
+		if (!$exists)
 		{
 			error_log('XML-RPC: function to be wrapped is not defined: '.$plainfuncname);
 			return false;
@@ -198,14 +198,14 @@ 
 		else
 		{
 			// determine name of new php function
-			if($newfuncname == '')
+			if ($newfuncname == '')
 			{
-				if(is_array($funcname))
+				if (is_array($funcname))
 				{
-    				if(is_string($funcname[0]))
+    				if (is_string($funcname[0]))
         				$xmlrpcfuncname = "{$prefix}_".implode('_', $funcname);
     				else
-    					$xmlrpcfuncname = "{$prefix}_".get_class($funcname[0]) . '_' . $funcname[1];
+    					$xmlrpcfuncname = "{$prefix}_".get_class($funcname[0]).'_'.$funcname[1];
 				}
 				else
 				{
@@ -216,37 +216,37 @@ 
 			{
 				$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;
@@ -257,7 +257,7 @@ 
 			{
     			$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 ?
@@ -277,27 +277,27 @@ 
 			$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 (strlen($doc) && strpos($doc, '@') !== 0 && !$i)
 					{
-						if($desc)
+						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 (preg_match('/@param\s+(\S+)(\s+\$\S+)?\s+(.+)/', $doc, $matches))
 						{
-							if(strpos($matches[1], '|'))
+							if (strpos($matches[1], '|'))
 							{
 								//$paramDocs[$i]['type'] = explode('|', $matches[1]);
 								$paramDocs[$i]['type'] = 'mixed';
@@ -311,14 +311,14 @@ 
 						}
 						$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,7 +330,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();
@@ -345,7 +345,7 @@ 
 			$parsvariations = array();
 			$pars = array();
 			$pnum = count($params);
-			foreach($params as $param)
+			foreach ($params as $param)
 			{
 				if (isset($paramDocs[$i]['name']) && $paramDocs[$i]['name'] && strtolower($paramDocs[$i]['name']) != strtolower($param['name']))
 				{
@@ -353,7 +353,7 @@ 
 					$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";
@@ -371,11 +371,11 @@ 
 
 				$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,7 +384,7 @@ 
 
 			$sigs = array();
 			$psigs = array();
-			if(count($parsvariations) == 0)
+			if (count($parsvariations) == 0)
 			{
 				// only known good synopsis = no parameters
 				$parsvariations[] = array();
@@ -395,24 +395,24 @@ 
 				$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;
+				$innercode = "\$paramcount = \$msg->getNumParams();\n".
+				"if (\$paramcount < $minpars) return new {$prefix}resp(0, {$GLOBALS['xmlrpcerr']['incorrect_params']}, '{$GLOBALS['xmlrpcstr']['incorrect_params']}');\n".$innercode;
 			}
 			else
 			{
-				$innercode = "\$paramcount = \$msg->getNumParams();\n" . $innercode;
+				$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];
+			    $GLOBALS['xmlrpcWPFObjHolder'][$xmlrpcfuncname] = & $funcname[0];
 			    $innercode .= "\$obj =& \$GLOBALS['xmlrpcWPFObjHolder']['$xmlrpcfuncname'];\n";
 			    $realfuncname = '$obj->'.$funcname[1];
 			}
@@ -420,13 +420,13 @@ 
 			{
     			$realfuncname = $plainfuncname;
             }
-			foreach($parsvariations as $pars)
+			foreach ($parsvariations as $pars)
 			{
-				$innercode .= "if (\$paramcount == " . count($pars) . ") \$retval = {$catch_warnings}$realfuncname(" . implode(',', $pars) . "); else\n";
+				$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++)
+				for ($i = 0; $i < count($pars); $i++)
 				{
 					if (isset($paramDocs[$i]['type']))
 					{
@@ -445,7 +445,7 @@ 
 			$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'));";
 			}
@@ -459,7 +459,7 @@ 
 			// shall we exclude functions returning by ref?
 			// if($func->returnsReference())
 			// 	return false;
-			$code = "function $xmlrpcfuncname(\$msg) {\n" . $innercode . "}\n}";
+			$code = "function $xmlrpcfuncname(\$msg) {\n".$innercode."}\n}";
 			//print_r($code);
 			if ($buildit)
 			{
@@ -468,7 +468,7 @@ 
 				// 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;
@@ -496,12 +496,12 @@ 
     * @todo get_class_methods will return both static and non-static methods.
     *       we have to differentiate the action, depending on wheter we recived a class name or object
     */
-    function wrap_php_class($classname, $extra_options=array())
+    function wrap_php_class($classname, $extra_options = array())
     {
 		$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');
@@ -510,19 +510,19 @@ 
 
         $result = array();
 		$mlist = get_class_methods($classname);
-		foreach($mlist as $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)))) ||
+        			if (($func->isStatic && ($methodtype == 'all' || $methodtype == 'static' || ($methodtype == 'auto' && is_string($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'];
                         }
@@ -570,7 +570,7 @@ 
 	*        bool          debug        set it to 1 or 2 to see debug results of querying server for method synopsis
 	* @return string                   the name of the generated php function (or false) - OR AN ARRAY...
 	*/
-	function wrap_xmlrpc_method($client, $methodname, $extra_options=0, $timeout=0, $protocol='', $newfuncname='')
+	function wrap_xmlrpc_method($client, $methodname, $extra_options = 0, $timeout = 0, $protocol = '', $newfuncname = '')
 	{
 		// 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?
@@ -581,8 +581,8 @@ 
 		}
 		else
 		{
-			$signum = isset($extra_options['signum']) ? (int)$extra_options['signum'] : 0;
-			$timeout = isset($extra_options['timeout']) ? (int)$extra_options['timeout'] : 0;
+			$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'] : '';
 			$newfuncname = isset($extra_options['new_function_name']) ? $extra_options['new_function_name'] : '';
 		}
@@ -590,9 +590,9 @@ 
 		//$verbatim_client_copy = in_array('simple_client_copy', $extra_options) ? 1 :
 		//	in_array('build_class_code', $extra_options) ? 2 : 0;
 
-		$encode_php_objects = isset($extra_options['encode_php_objs']) ? (bool)$extra_options['encode_php_objs'] : false;
-		$decode_php_objects = isset($extra_options['decode_php_objs']) ? (bool)$extra_options['decode_php_objs'] : false;
-		$simple_client_copy = isset($extra_options['simple_client_copy']) ? (int)($extra_options['simple_client_copy']) : 0;
+		$encode_php_objects = isset($extra_options['encode_php_objs']) ? (bool) $extra_options['encode_php_objs'] : false;
+		$decode_php_objects = isset($extra_options['decode_php_objs']) ? (bool) $extra_options['decode_php_objs'] : false;
+		$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']))
@@ -614,8 +614,8 @@ 
 		$msg = new $msgclass('system.methodSignature');
 		$msg->addparam(new $valclass($methodname));
 		$client->setDebug($debug);
-		$response =& $client->send($msg, $timeout, $protocol);
-		if($response->faultCode())
+		$response = & $client->send($msg, $timeout, $protocol);
+		if ($response->faultCode())
 		{
 			error_log('XML-RPC: could not retrieve method signature from remote server for method '.$methodname);
 			return false;
@@ -627,7 +627,7 @@ 
 			{
 				$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;
@@ -635,7 +635,7 @@ 
 			else
 			{
 				// pick a suitable name for the new function, avoiding collisions
-				if($newfuncname != '')
+				if ($newfuncname != '')
 				{
 					$xmlrpcfuncname = $newfuncname;
 				}
@@ -646,7 +646,7 @@ 
 					$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,11 +655,11 @@ 
 				$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);
+					$response = & $client->send($msg, $timeout, $protocol);
 					if (!$response->faultCode())
 					{
 						$mdesc = $response->value();
@@ -682,7 +682,7 @@ 
 					eval($results['source'].'$allOK=1;');
 					// alternative
 					//$xmlrpcfuncname = create_function('$m', $innercode);
-					if($allOK)
+					if ($allOK)
 					{
 						return $xmlrpcfuncname;
 					}
@@ -709,15 +709,15 @@ 
 	* @param array $extra_options list of options for wrapped code
 	* @return mixed false on error, the name of the created class if all ok or an array with code, class name and comments (if the appropriatevoption is set in extra_options)
 	*/
-	function wrap_xmlrpc_server($client, $extra_options=array())
+	function wrap_xmlrpc_server($client, $extra_options = array())
 	{
 		$methodfilter = isset($extra_options['method_filter']) ? $extra_options['method_filter'] : '';
 		//$signum = isset($extra_options['signum']) ? (int)$extra_options['signum'] : 0;
-		$timeout = isset($extra_options['timeout']) ? (int)$extra_options['timeout'] : 0;
+		$timeout = isset($extra_options['timeout']) ? (int) $extra_options['timeout'] : 0;
 		$protocol = isset($extra_options['protocol']) ? $extra_options['protocol'] : '';
 		$newclassname = isset($extra_options['new_class_name']) ? $extra_options['new_class_name'] : '';
-		$encode_php_objects = isset($extra_options['encode_php_objs']) ? (bool)$extra_options['encode_php_objs'] : false;
-		$decode_php_objects = isset($extra_options['decode_php_objs']) ? (bool)$extra_options['decode_php_objs'] : false;
+		$encode_php_objects = isset($extra_options['encode_php_objs']) ? (bool) $extra_options['encode_php_objs'] : false;
+		$decode_php_objects = isset($extra_options['decode_php_objs']) ? (bool) $extra_options['decode_php_objs'] : false;
 		$verbatim_client_copy = isset($extra_options['simple_client_copy']) ? !($extra_options['simple_client_copy']) : true;
 		$buildit = isset($extra_options['return_source']) ? !($extra_options['return_source']) : true;
 		$prefix = isset($extra_options['prefix']) ? $extra_options['prefix'] : 'xmlrpc';
@@ -727,8 +727,8 @@ 
 		$decodefunc = 'php_'.$prefix.'_decode';
 
 		$msg = new $msgclass('system.listMethods');
-		$response =& $client->send($msg, $timeout, $protocol);
-		if($response->faultCode())
+		$response = & $client->send($msg, $timeout, $protocol);
+		if ($response->faultCode())
 		{
 			error_log('XML-RPC: could not retrieve method list from remote server');
 			return false;
@@ -740,7 +740,7 @@ 
 			{
 				$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;
@@ -748,7 +748,7 @@ 
 			else
 			{
 				// pick a suitable name for the new function, avoiding collisions
-				if($newclassname != '')
+				if ($newclassname != '')
 				{
 					$xmlrpcclassname = $newclassname;
 				}
@@ -757,7 +757,7 @@ 
 					$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,7 +773,7 @@ 
 					'decode_php_objs' => $decode_php_objects
 					);
 				/// @todo build javadoc for class definition, too
-				foreach($mlist as $mname)
+				foreach ($mlist as $mname)
 				{
 					if ($methodfilter == '' || preg_match($methodfilter, $mname))
 					{
@@ -801,7 +801,7 @@ 
 					eval($source.'$allOK=1;');
 					// alternative
 					//$xmlrpcfuncname = create_function('$m', $innercode);
-					if($allOK)
+					if ($allOK)
 					{
 						return $xmlrpcclassname;
 					}
@@ -828,9 +828,9 @@ 
 	* @access private
 	*/
 	function build_remote_method_wrapper_code($client, $methodname, $xmlrpcfuncname,
-		$msig, $mdesc='', $timeout=0, $protocol='', $client_copy_mode=0, $prefix='xmlrpc',
-		$decode_php_objects=false, $encode_php_objects=false, $decode_fault=false,
-		$fault_response='')
+		$msig, $mdesc = '', $timeout = 0, $protocol = '', $client_copy_mode = 0, $prefix = 'xmlrpc',
+		$decode_php_objects = false, $encode_php_objects = false, $decode_fault = false,
+		$fault_response = '')
 	{
 		$code = "function $xmlrpcfuncname (";
 		if ($client_copy_mode < 2)
@@ -861,11 +861,11 @@ 
 		// 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' ||
+			if ($ptype == 'i4' || $ptype == 'int' || $ptype == 'boolean' || $ptype == 'double' ||
 				$ptype == 'string' || $ptype == 'dateTime.iso8601' || $ptype == 'base64' || $ptype == 'null')
 			{
 				// only build directly xmlrpcvals when type is known and scalar
@@ -918,7 +918,7 @@ 
 			$innercode .= "if (\$res->faultcode()) return $respcode; else return php_{$prefix}_decode(\$res->value());";
 		}
 
-		$code = $code . $plist. ") {\n" . $innercode . "\n}\n";
+		$code = $code.$plist.") {\n".$innercode."\n}\n";
 
 		return array('source' => $code, 'docstring' => $mdesc);
 	}
@@ -929,18 +929,18 @@ 
 	* valid php code is emitted.
 	* @access private
 	*/
-	function build_client_wrapper_code($client, $verbatim_client_copy, $prefix='xmlrpc')
+	function build_client_wrapper_code($client, $verbatim_client_copy, $prefix = 'xmlrpc')
 	{
 		$code = "\$client = new {$prefix}_client('".str_replace("'", "\'", $client->path).
-			"', '" . str_replace("'", "\'", $client->server) . "', $client->port);\n";
+			"', '".str_replace("'", "\'", $client->server)."', $client->port);\n";
 
 		// 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)
+			foreach ($client as $fld => $val)
 			{
-				if($fld != 'debug' && $fld != 'return_type')
+				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

Spacing +179 added lines, -179 removed lines

@@ -58,10 +58,10 @@ 
 	);
 
 	/* Functions that implement system.XXX methods of xmlrpc servers */
-	$_xmlrpcs_getCapabilities_sig=array(array($GLOBALS['xmlrpcStruct']));
-	$_xmlrpcs_getCapabilities_doc='This method lists all the capabilites that the XML-RPC server has: the (more or less standard) extensions to the xmlrpc spec that it adheres to';
-	$_xmlrpcs_getCapabilities_sdoc=array(array('list of capabilities, described as structs with a version number and url for the spec'));
-	function _xmlrpcs_getCapabilities($server, $m=null)
+	$_xmlrpcs_getCapabilities_sig = array(array($GLOBALS['xmlrpcStruct']));
+	$_xmlrpcs_getCapabilities_doc = 'This method lists all the capabilites that the XML-RPC server has: the (more or less standard) extensions to the xmlrpc spec that it adheres to';
+	$_xmlrpcs_getCapabilities_sdoc = array(array('list of capabilities, described as structs with a version number and url for the spec'));
+	function _xmlrpcs_getCapabilities($server, $m = null)
 	{
 		$outAr = $GLOBALS['xmlrpcs_capabilities'];
 		// NIL extension
@@ -76,117 +76,117 @@ 
 
 	// listMethods: signature was either a string, or nothing.
 	// The useless string variant has been removed
-	$_xmlrpcs_listMethods_sig=array(array($GLOBALS['xmlrpcArray']));
-	$_xmlrpcs_listMethods_doc='This method lists all the methods that the XML-RPC server knows how to dispatch';
-	$_xmlrpcs_listMethods_sdoc=array(array('list of method names'));
-	function _xmlrpcs_listMethods($server, $m=null) // if called in plain php values mode, second param is missing
+	$_xmlrpcs_listMethods_sig = array(array($GLOBALS['xmlrpcArray']));
+	$_xmlrpcs_listMethods_doc = 'This method lists all the methods that the XML-RPC server knows how to dispatch';
+	$_xmlrpcs_listMethods_sdoc = array(array('list of method names'));
+	function _xmlrpcs_listMethods($server, $m = null) // if called in plain php values mode, second param is missing
 	{
 
-		$outAr=array();
-		foreach($server->dmap as $key => $val)
+		$outAr = array();
+		foreach ($server->dmap as $key => $val)
 		{
-			$outAr[]=new xmlrpcval($key, 'string');
+			$outAr[] = new xmlrpcval($key, 'string');
 		}
-		if($server->allow_system_funcs)
+		if ($server->allow_system_funcs)
 		{
-			foreach($GLOBALS['_xmlrpcs_dmap'] as $key => $val)
+			foreach ($GLOBALS['_xmlrpcs_dmap'] as $key => $val)
 			{
-				$outAr[]=new xmlrpcval($key, 'string');
+				$outAr[] = new xmlrpcval($key, 'string');
 			}
 		}
 		return new xmlrpcresp(new xmlrpcval($outAr, 'array'));
 	}
 
-	$_xmlrpcs_methodSignature_sig=array(array($GLOBALS['xmlrpcArray'], $GLOBALS['xmlrpcString']));
-	$_xmlrpcs_methodSignature_doc='Returns an array of known signatures (an array of arrays) for the method name passed. If no signatures are known, returns a none-array (test for type != array to detect missing signature)';
-	$_xmlrpcs_methodSignature_sdoc=array(array('list of known signatures, each sig being an array of xmlrpc type names', 'name of method to be described'));
+	$_xmlrpcs_methodSignature_sig = array(array($GLOBALS['xmlrpcArray'], $GLOBALS['xmlrpcString']));
+	$_xmlrpcs_methodSignature_doc = 'Returns an array of known signatures (an array of arrays) for the method name passed. If no signatures are known, returns a none-array (test for type != array to detect missing signature)';
+	$_xmlrpcs_methodSignature_sdoc = array(array('list of known signatures, each sig being an array of xmlrpc type names', 'name of method to be described'));
 	function _xmlrpcs_methodSignature($server, $m)
 	{
 		// let accept as parameter both an xmlrpcval or string
 		if (is_object($m))
 		{
-			$methName=$m->getParam(0);
-			$methName=$methName->scalarval();
+			$methName = $m->getParam(0);
+			$methName = $methName->scalarval();
 		}
 		else
 		{
-			$methName=$m;
+			$methName = $m;
 		}
-		if(strpos($methName, "system.") === 0)
+		if (strpos($methName, "system.") === 0)
 		{
-			$dmap=$GLOBALS['_xmlrpcs_dmap']; $sysCall=1;
+			$dmap = $GLOBALS['_xmlrpcs_dmap']; $sysCall = 1;
 		}
 		else
 		{
-			$dmap=$server->dmap; $sysCall=0;
+			$dmap = $server->dmap; $sysCall = 0;
 		}
-		if(isset($dmap[$methName]))
+		if (isset($dmap[$methName]))
 		{
-			if(isset($dmap[$methName]['signature']))
+			if (isset($dmap[$methName]['signature']))
 			{
-				$sigs=array();
-				foreach($dmap[$methName]['signature'] as $inSig)
+				$sigs = array();
+				foreach ($dmap[$methName]['signature'] as $inSig)
 				{
-					$cursig=array();
-					foreach($inSig as $sig)
+					$cursig = array();
+					foreach ($inSig as $sig)
 					{
-						$cursig[]=new xmlrpcval($sig, 'string');
+						$cursig[] = new xmlrpcval($sig, 'string');
 					}
-					$sigs[]=new xmlrpcval($cursig, 'array');
+					$sigs[] = new xmlrpcval($cursig, 'array');
 				}
-				$r=new xmlrpcresp(new xmlrpcval($sigs, 'array'));
+				$r = new xmlrpcresp(new xmlrpcval($sigs, 'array'));
 			}
 			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'));
+				$r = new xmlrpcresp(new xmlrpcval('undef', 'string'));
 			}
 		}
 		else
 		{
-			$r=new xmlrpcresp(0,$GLOBALS['xmlrpcerr']['introspect_unknown'], $GLOBALS['xmlrpcstr']['introspect_unknown']);
+			$r = new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['introspect_unknown'], $GLOBALS['xmlrpcstr']['introspect_unknown']);
 		}
 		return $r;
 	}
 
-	$_xmlrpcs_methodHelp_sig=array(array($GLOBALS['xmlrpcString'], $GLOBALS['xmlrpcString']));
-	$_xmlrpcs_methodHelp_doc='Returns help text if defined for the method passed, otherwise returns an empty string';
-	$_xmlrpcs_methodHelp_sdoc=array(array('method description', 'name of the method to be described'));
+	$_xmlrpcs_methodHelp_sig = array(array($GLOBALS['xmlrpcString'], $GLOBALS['xmlrpcString']));
+	$_xmlrpcs_methodHelp_doc = 'Returns help text if defined for the method passed, otherwise returns an empty string';
+	$_xmlrpcs_methodHelp_sdoc = array(array('method description', 'name of the method to be described'));
 	function _xmlrpcs_methodHelp($server, $m)
 	{
 		// let accept as parameter both an xmlrpcval or string
 		if (is_object($m))
 		{
-			$methName=$m->getParam(0);
-			$methName=$methName->scalarval();
+			$methName = $m->getParam(0);
+			$methName = $methName->scalarval();
 		}
 		else
 		{
-			$methName=$m;
+			$methName = $m;
 		}
-		if(strpos($methName, "system.") === 0)
+		if (strpos($methName, "system.") === 0)
 		{
-			$dmap=$GLOBALS['_xmlrpcs_dmap']; $sysCall=1;
+			$dmap = $GLOBALS['_xmlrpcs_dmap']; $sysCall = 1;
 		}
 		else
 		{
-			$dmap=$server->dmap; $sysCall=0;
+			$dmap = $server->dmap; $sysCall = 0;
 		}
-		if(isset($dmap[$methName]))
+		if (isset($dmap[$methName]))
 		{
-			if(isset($dmap[$methName]['docstring']))
+			if (isset($dmap[$methName]['docstring']))
 			{
-				$r=new xmlrpcresp(new xmlrpcval($dmap[$methName]['docstring']), 'string');
+				$r = new xmlrpcresp(new xmlrpcval($dmap[$methName]['docstring']), 'string');
 			}
 			else
 			{
-				$r=new xmlrpcresp(new xmlrpcval('', 'string'));
+				$r = new xmlrpcresp(new xmlrpcval('', 'string'));
 			}
 		}
 		else
 		{
-			$r=new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['introspect_unknown'], $GLOBALS['xmlrpcstr']['introspect_unknown']);
+			$r = new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['introspect_unknown'], $GLOBALS['xmlrpcstr']['introspect_unknown']);
 		}
 		return $r;
 	}
@@ -196,7 +196,7 @@ 
 	$_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}"];
@@ -214,52 +214,52 @@ 
 
 	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++)
+		for ($i = 0; $i < $numParams; $i++)
 		{
-			if(!$msg->addParam($params->arraymem($i)))
+			if (!$msg->addParam($params->arraymem($i)))
 			{
 				$i++;
 				return _xmlrpcs_multicall_error(new xmlrpcresp(0,
 					$GLOBALS['xmlrpcerr']['incorrect_params'],
-					$GLOBALS['xmlrpcstr']['incorrect_params'] . ": probable xml error in param " . $i));
+					$GLOBALS['xmlrpcstr']['incorrect_params'].": probable xml error in param ".$i));
 			}
 		}
 
 		$result = $server->execute($msg);
 
-		if($result->faultCode() != 0)
+		if ($result->faultCode() != 0)
 		{
-			return _xmlrpcs_multicall_error($result);		// Method returned fault.
+			return _xmlrpcs_multicall_error($result); // Method returned fault.
 		}
 
 		return new xmlrpcval(array($result->value()), 'array');
@@ -267,11 +267,11 @@ 
 
 	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');
 		}
@@ -279,15 +279,15 @@ 
 		{
 			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,14 +296,14 @@ 
 		// base64 or datetime values, but they will be listed as strings here...
 		$numParams = count($call['params']);
 		$pt = array();
-		foreach($call['params'] as $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.
+			return _xmlrpcs_multicall_error($result); // Method returned fault.
 		}
 
 		return new xmlrpcval(array($result->value()), 'array');
@@ -317,7 +317,7 @@ 
 		{
 			$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);
@@ -325,8 +325,8 @@ 
 		}
 		else
 		{
-			$numCalls=count($m);
-			for($i = 0; $i < $numCalls; $i++)
+			$numCalls = count($m);
+			for ($i = 0; $i < $numCalls; $i++)
 			{
 				$result[$i] = _xmlrpcs_multicall_do_call_phpvals($server, $m[$i]);
 			}
@@ -335,7 +335,7 @@ 
 		return new xmlrpcresp(new xmlrpcval($result, 'array'));
 	}
 
-	$GLOBALS['_xmlrpcs_dmap']=array(
+	$GLOBALS['_xmlrpcs_dmap'] = array(
 		'system.listMethods' => array(
 			'function' => '_xmlrpcs_listMethods',
 			'signature' => $_xmlrpcs_listMethods_sig,
@@ -375,24 +375,24 @@ 
 	* NB: in fact a user defined error handler can only handle WARNING, NOTICE and USER_* errors.
 	*
 	*/
-	function _xmlrpcs_errorHandler($errcode, $errstring, $filename=null, $lineno=null, $context=null)
+	function _xmlrpcs_errorHandler($errcode, $errstring, $filename = null, $lineno = null, $context = null)
 	{
 		// obey the @ protocol
 		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";
+			$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);
 			}
@@ -400,10 +400,10 @@ 
 		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));
@@ -416,7 +416,7 @@ 
 		}
 	}
 
-	$GLOBALS['_xmlrpc_debuginfo']='';
+	$GLOBALS['_xmlrpc_debuginfo'] = '';
 
 	/**
 	* Add a string to the debug info that can be later seralized by the server
@@ -428,7 +428,7 @@ 
 	*/
 	function xmlrpc_debugmsg($m)
 	{
-		$GLOBALS['_xmlrpc_debuginfo'] .= $m . "\n";
+		$GLOBALS['_xmlrpc_debuginfo'] .= $m."\n";
 	}
 
 	class xmlrpc_server
@@ -437,20 +437,20 @@ 
 		* Array defining php functions exposed as xmlrpc methods by this server
 		* @access private
 		*/
-		var $dmap=array();
+		var $dmap = array();
 		/**
 		* Defines how functions in dmap will be invoked: either using an xmlrpc msg object
 		* or plain php values.
 		* valid strings are 'xmlrpcvals', 'phpvals' or 'epivals'
 		*/
-		var $functions_parameters_type='xmlrpcvals';
+		var $functions_parameters_type = 'xmlrpcvals';
 		/**
 		* Option used for fine-tuning the encoding the php values returned from
 		* functions registered in the dispatch map when the functions_parameters_types
 		* member is set to 'phpvals'
 		* @see php_xmlrpc_encode for a list of values
 		*/
-		var $phpvals_encoding_options = array( 'auto_dates' );
+		var $phpvals_encoding_options = array('auto_dates');
 		/// controls wether the server is going to echo debugging messages back to the client as comments in response body. valid values: 0,1,2,3
 		var $debug = 1;
 		/**
@@ -498,11 +498,11 @@ 
 		* @param array $dispmap the dispatch map withd efinition of exposed services
 		* @param boolean $servicenow set to false to prevent the server from runnung upon construction
 		*/
-		function xmlrpc_server($dispMap=null, $serviceNow=true)
+		function xmlrpc_server($dispMap = null, $serviceNow = true)
 		{
 			// 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,10 +520,10 @@ 
 			 * 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();
 				}
@@ -546,7 +546,7 @@ 
 		*/
 		function setDebug($in)
 		{
-			$this->debug=$in;
+			$this->debug = $in;
 		}
 
 		/**
@@ -554,7 +554,7 @@ 
 		* @param string $charset_encoding the target charset encoding for the serialization
 		* @return string an XML comment (or two)
 		*/
-		function serializeDebug($charset_encoding='')
+		function serializeDebug($charset_encoding = '')
 		{
 			// Tough encoding problem: which internal charset should we assume for debug info?
 			// It might contain a copy of raw data received from client, ie with unknown encoding,
@@ -566,10 +566,10 @@ 
 			{
 				$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";
+				$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
 				// into return payload AFTER the beginning tag
 				//$out .= "<![CDATA[ DEBUG INFO:\n\n" . str_replace(']]>', ']_]_>', $GLOBALS['_xmlrpc_debuginfo']) . "\n]]>\n";
@@ -583,7 +583,7 @@ 
 		* @return xmlrpcresp the response object (usually not used by caller...)
 		* @access public
 		*/
-		function service($data=null, $return_payload=false)
+		function service($data = null, $return_payload = false)
 		{
 			if ($data === null)
 			{
@@ -604,30 +604,30 @@ 
 			$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+++");
+				$this->debugmsg("+++GOT+++\n".$data."\n+++END+++");
 			}
 
 			$r = $this->parseRequestHeaders($data, $req_charset, $resp_charset, $resp_encoding);
 			if (!$r)
 			{
-				$r=$this->parseRequest($data, $req_charset);
+				$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+++");
+				$this->debugmsg("+++PROCESSING ERRORS AND WARNINGS+++\n".
+					$GLOBALS['_xmlrpcs_occurred_errors']."+++END+++");
 			}
 
-			$payload=$this->xml_header($resp_charset);
-			if($this->debug > 0)
+			$payload = $this->xml_header($resp_charset);
+			if ($this->debug > 0)
 			{
-				$payload = $payload . $this->serializeDebug($resp_charset);
+				$payload = $payload.$this->serializeDebug($resp_charset);
 			}
 
 			// G. Giunta 2006-01-27: do not create response serialization if it has
@@ -636,7 +636,7 @@ 
 			{
 				$r->serialize($resp_charset);
 			}
-			$payload = $payload . $r->payload;
+			$payload = $payload.$r->payload;
 
 			if ($return_payload)
 			{
@@ -645,7 +645,7 @@ 
 
 			// 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
@@ -656,10 +656,10 @@ 
 				// if we can do it, and we want to do it, and client asked us to,
 				// 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 != ''
+				if ($this->compress_response && function_exists('gzencode') && $resp_encoding != ''
 					&& $php_no_self_compress)
 				{
-					if(strpos($resp_encoding, 'gzip') !== false)
+					if (strpos($resp_encoding, 'gzip') !== false)
 					{
 						$payload = gzencode($payload);
 						header("Content-Encoding: gzip");
@@ -675,9 +675,9 @@ 
 
 				// 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));
+					header('Content-Length: '.(int) strlen($payload));
 				}
 			}
 			else
@@ -700,7 +700,7 @@ 
 		* @param array $sigdoc the array of valid method signatures docs (one string per param, one for return type)
 		* @access public
 		*/
-		function add_to_map($methodname,$function,$sig=null,$doc=false,$sigdoc=false)
+		function add_to_map($methodname, $function, $sig = null, $doc = false, $sigdoc = false)
 		{
 			$this->dmap[$methodname] = array(
 				'function'	=> $function,
@@ -733,47 +733,47 @@ 
 			{
 				$numParams = count($in);
 			}
-			foreach($sig as $cursig)
+			foreach ($sig as $cursig)
 			{
-				if(count($cursig)==$numParams+1)
+				if (count($cursig) == $numParams + 1)
 				{
-					$itsOK=1;
-					for($n=0; $n<$numParams; $n++)
+					$itsOK = 1;
+					for ($n = 0; $n < $numParams; $n++)
 					{
 						if (is_object($in))
 						{
-							$p=$in->getParam($n);
-							if($p->kindOf() == 'scalar')
+							$p = $in->getParam($n);
+							if ($p->kindOf() == 'scalar')
 							{
-								$pt=$p->scalartyp();
+								$pt = $p->scalartyp();
 							}
 							else
 							{
-								$pt=$p->kindOf();
+								$pt = $p->kindOf();
 							}
 						}
 						else
 						{
-							$pt= $in[$n] == 'i4' ? 'int' : strtolower($in[$n]); // dispatch maps never use i4...
+							$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];
-							$got=$pt;
+							$itsOK = 0;
+							$pno = $n + 1;
+							$wanted = $cursig[$n + 1];
+							$got = $pt;
 							break;
 						}
 					}
-					if($itsOK)
+					if ($itsOK)
 					{
-						return array(1,'');
+						return array(1, '');
 					}
 				}
 			}
-			if(isset($wanted))
+			if (isset($wanted))
 			{
 				return array(0, "Wanted ${wanted}, got ${got} at param ${pno}");
 			}
@@ -797,12 +797,12 @@ 
 				error_log('XML-RPC: '.__METHOD__.': cannot parse request headers as $_SERVER is not populated');
 			}
 
-			if($this->debug > 1)
+			if ($this->debug > 1)
 			{
-				if(function_exists('getallheaders'))
+				if (function_exists('getallheaders'))
 				{
 					$this->debugmsg(''); // empty line
-					foreach(getallheaders() as $name => $val)
+					foreach (getallheaders() as $name => $val)
 					{
 						$this->debugmsg("HEADER: $name: $val");
 					}
@@ -810,7 +810,7 @@ 
 
 			}
 
-			if(isset($_SERVER['HTTP_CONTENT_ENCODING']))
+			if (isset($_SERVER['HTTP_CONTENT_ENCODING']))
 			{
 				$content_encoding = str_replace('x-', '', $_SERVER['HTTP_CONTENT_ENCODING']);
 			}
@@ -820,26 +820,26 @@ 
 			}
 
 			// check if request body has been compressed and decompress it
-			if($content_encoding != '' && strlen($data))
+			if ($content_encoding != '' && strlen($data))
 			{
-				if($content_encoding == 'deflate' || $content_encoding == 'gzip')
+				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 (function_exists('gzinflate') && in_array($content_encoding, $this->accepted_compression))
 					{
-						if($content_encoding == 'deflate' && $degzdata = @gzuncompress($data))
+						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+++");
+								$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+++");
+							if ($this->debug > 1)
+								$this->debugmsg("+++INFLATED REQUEST+++[".strlen($data)." chars]+++\n".$data."\n+++END+++");
 						}
 						else
 						{
@@ -912,7 +912,7 @@ 
 		* @return xmlrpcresp
 		* @access private
 		*/
-		function parseRequest($data, $req_encoding='')
+		function parseRequest($data, $req_encoding = '')
 		{
 			// 2005/05/07 commented and moved into caller function code
 			//if($data=='')
@@ -924,16 +924,16 @@ 
 			// so we do not try to convert them into xml character entities
 			//$data = xmlrpc_html_entity_xlate($data);
 
-			$GLOBALS['_xh']=array();
-			$GLOBALS['_xh']['ac']='';
-			$GLOBALS['_xh']['stack']=array();
+			$GLOBALS['_xh'] = array();
+			$GLOBALS['_xh']['ac'] = '';
+			$GLOBALS['_xh']['stack'] = array();
 			$GLOBALS['_xh']['valuestack'] = array();
-			$GLOBALS['_xh']['params']=array();
-			$GLOBALS['_xh']['pt']=array();
-			$GLOBALS['_xh']['isf']=0;
-			$GLOBALS['_xh']['isf_reason']='';
-			$GLOBALS['_xh']['method']=false; // so we can check later if we got a methodname or not
-			$GLOBALS['_xh']['rt']='';
+			$GLOBALS['_xh']['params'] = array();
+			$GLOBALS['_xh']['pt'] = array();
+			$GLOBALS['_xh']['isf'] = 0;
+			$GLOBALS['_xh']['isf_reason'] = '';
+			$GLOBALS['_xh']['method'] = false; // so we can check later if we got a methodname or not
+			$GLOBALS['_xh']['rt'] = '';
 
 			// decompose incoming XML into request structure
 			if ($req_encoding != '')
@@ -978,11 +978,11 @@ 
 				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),
+				$r = new xmlrpcresp(0,
+				$GLOBALS['xmlrpcerrxml'] + xml_get_error_code($parser),
 				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)));
@@ -991,9 +991,9 @@ 
 			elseif ($GLOBALS['_xh']['isf'])
 			{
 				xml_parser_free($parser);
-				$r=new xmlrpcresp(0,
+				$r = new xmlrpcresp(0,
 					$GLOBALS['xmlrpcerr']['invalid_request'],
-					$GLOBALS['xmlrpcstr']['invalid_request'] . ' ' . $GLOBALS['_xh']['isf_reason']);
+					$GLOBALS['xmlrpcstr']['invalid_request'].' '.$GLOBALS['_xh']['isf_reason']);
 			}
 			else
 			{
@@ -1004,7 +1004,7 @@ 
 				// 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->debug > 1)
 					{
 						$this->debugmsg("\n+++PARSED+++\n".var_export($GLOBALS['_xh']['params'], true)."\n+++END+++");
 					}
@@ -1013,14 +1013,14 @@ 
 				else
 				{
 					// build an xmlrpcmsg object with data parsed from xml
-					$m=new xmlrpcmsg($GLOBALS['_xh']['method']);
+					$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+++");
 					}
@@ -1038,7 +1038,7 @@ 
 		* @return xmlrpcresp
 		* @access private
 		*/
-		function execute($m, $params=null, $paramtypes=null)
+		function execute($m, $params = null, $paramtypes = null)
 		{
 			if (is_object($m))
 			{
@@ -1051,7 +1051,7 @@ 
 			$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,
@@ -1060,7 +1060,7 @@ 
 			}
 
 			// Check signature
-			if(isset($dmap[$methName]['signature']))
+			if (isset($dmap[$methName]['signature']))
 			{
 				$sig = $dmap[$methName]['signature'];
 				if (is_object($m))
@@ -1071,37 +1071,37 @@ 
 				{
 					list($ok, $errstr) = $this->verifySignature($paramtypes, $sig);
 				}
-				if(!$ok)
+				if (!$ok)
 				{
 					// Didn't match.
 					return new xmlrpcresp(
 						0,
 						$GLOBALS['xmlrpcerr']['incorrect_params'],
-						$GLOBALS['xmlrpcstr']['incorrect_params'] . ": ${errstr}"
+						$GLOBALS['xmlrpcstr']['incorrect_params'].": ${errstr}"
 					);
 				}
 			}
 
 			$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,
 					$GLOBALS['xmlrpcerr']['server_error'],
-					$GLOBALS['xmlrpcstr']['server_error'] . ": no function matches method"
+					$GLOBALS['xmlrpcstr']['server_error'].": no function matches method"
 				);
 			}
 
 			// 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');
 			}
@@ -1110,7 +1110,7 @@ 
 				// Allow mixed-convention servers
 				if (is_object($m))
 				{
-					if($sysCall)
+					if ($sysCall)
 					{
 						$r = call_user_func($func, $this, $m);
 					}
@@ -1130,7 +1130,7 @@ 
 							$r = new xmlrpcresp(
 								0,
 								$GLOBALS['xmlrpcerr']['server_error'],
-								$GLOBALS['xmlrpcstr']['server_error'] . ": function does not return xmlrpcresp object"
+								$GLOBALS['xmlrpcstr']['server_error'].": function does not return xmlrpcresp object"
 							);
 						}
 					}
@@ -1138,7 +1138,7 @@ 
 				else
 				{
 					// call a 'plain php' function
-					if($sysCall)
+					if ($sysCall)
 					{
 						array_unshift($params, $this);
 						$r = call_user_func_array($func, $params);
@@ -1153,7 +1153,7 @@ 
 							// an eror response
 							if (is_array($r) && array_key_exists('faultCode', $r) && array_key_exists('faultString', $r))
 							{
-								$r = new xmlrpcresp(0, (integer)$r['faultCode'], (string)$r['faultString']);
+								$r = new xmlrpcresp(0, (integer) $r['faultCode'], (string) $r['faultString']);
 							}
 							else
 							{
@@ -1176,11 +1176,11 @@ 
 					}
 				}
 			}
-			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;
@@ -1192,11 +1192,11 @@ 
 						$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']);
 				}
@@ -1221,15 +1221,15 @@ 
 		/**
 		* @access private
 		*/
-		function xml_header($charset_encoding='')
+		function xml_header($charset_encoding = '')
 		{
 			if ($charset_encoding != '')
 			{
-				return "<?xml version=\"1.0\" encoding=\"$charset_encoding\"?" . ">\n";
+				return "<?xml version=\"1.0\" encoding=\"$charset_encoding\"?".">\n";
 			}
 			else
 			{
-				return "<?xml version=\"1.0\"?" . ">\n";
+				return "<?xml version=\"1.0\"?".">\n";
 			}
 		}
 
@@ -1239,7 +1239,7 @@ 
 		*/
 		function echoInput()
 		{
-			$r=new xmlrpcresp(new xmlrpcval( "'Aha said I: '" . $GLOBALS['HTTP_RAW_POST_DATA'], 'string'));
+			$r = new xmlrpcresp(new xmlrpcval("'Aha said I: '".$GLOBALS['HTTP_RAW_POST_DATA'], 'string'));
 			print $r->serialize();
 		}
 	}

Components/Klarna/Klarna.php

Spacing +45 added lines, -45 removed lines

@@ -467,13 +467,13 @@ 
             $this->setCountry($this->config['country']);
             $this->setLanguage($this->config['language']);
             $this->setCurrency($this->config['currency']);
-        } catch(Exception $e) {
+        } catch (Exception $e) {
             //fields missing for country, language or currency
             $this->_country = $this->_language = $this->_currency = null;
         }
 
         //Set addr and port according to mode.
-        $this->mode = (int)$this->config['mode'];
+        $this->mode = (int) $this->config['mode'];
 
         $this->_url = array();
 
@@ -482,7 +482,7 @@ 
         if (isset($this->config['url'])) {
             $this->_url = parse_url($this->config['url']);
             if ($this->_url === false) {
-                $message = "Configuration value 'url' could not be parsed. " .
+                $message = "Configuration value 'url' could not be parsed. ".
                     "(Was: '{$this->config['url']}')";
                 Klarna::printDebug(__METHOD__, $message);
                 throw new InvalidArgumentException($message);
@@ -498,7 +498,7 @@ 
             }
 
             if (isset($this->config['ssl'])
-                && (bool)$this->config['ssl'] === false
+                && (bool) $this->config['ssl'] === false
             ) {
                 $this->_url['scheme'] = 'http';
             }
@@ -515,22 +515,22 @@ 
 
         try {
             $this->hasFields('candice');
-            self::$_candice = (bool)$this->config['candice'];
-        } catch(Exception $e) {
+            self::$_candice = (bool) $this->config['candice'];
+        } catch (Exception $e) {
             //No 'candice' field ignore it...
         }
 
         try {
             $this->hasFields('xmlrpcDebug');
             Klarna::$xmlrpcDebug = $this->config['xmlrpcDebug'];
-        } catch(Exception $e) {
+        } catch (Exception $e) {
             //No 'xmlrpcDebug' field ignore it...
         }
 
         try {
             $this->hasFields('debug');
             Klarna::$debug = $this->config['debug'];
-        } catch(Exception $e) {
+        } catch (Exception $e) {
             //No 'debug' field ignore it...
         }
 
@@ -608,7 +608,7 @@ 
             $this->config['pcURI'] = $pcURI;
 
             $this->init();
-        } catch(Exception $e) {
+        } catch (Exception $e) {
             $this->config = null;
             throw new KlarnaException(
                 $e->getMessage(),
@@ -1257,7 +1257,7 @@ 
             $user = strval($user);
         }
 
-        if (strlen($user) > 0 ) {
+        if (strlen($user) > 0) {
             $this->setExtraInfo('estore_user', $user);
         }
 
@@ -1475,7 +1475,7 @@ 
                     continue;
                 }
                 $addrs[] = $addr;
-            } catch(Exception $e) {
+            } catch (Exception $e) {
                 //Silently fail
             }
         }
@@ -1524,8 +1524,8 @@ 
         $this->_checkQty($qty);
 
         // Either artno or title has to be set
-        if ((($artNo === null ) || ($artNo == ""))
-            && (($title === null ) || ($title == ""))
+        if ((($artNo === null) || ($artNo == ""))
+            && (($title === null) || ($title == ""))
         ) {
             throw new Klarna_ArgumentNotSetException('Title and ArtNo', 50026);
         }
@@ -1559,7 +1559,7 @@ 
         if (count($this->goodsList) > 0) {
             self::printDebug(
                 "article added",
-                $this->goodsList[count($this->goodsList)-1]
+                $this->goodsList[count($this->goodsList) - 1]
             );
         }
     }
@@ -1642,7 +1642,7 @@ 
             $this->_checkInt($gender, 'gender');
         }
 
-        $this->_checkInt($flags,  'flags');
+        $this->_checkInt($flags, 'flags');
         $this->_checkInt($pclass, 'pclass');
 
         //Check so required information is set.
@@ -1677,9 +1677,9 @@ 
         //function add_transaction_digest
         $string = "";
         foreach ($this->goodsList as $goods) {
-            $string .= $goods['goods']['title'] .':';
+            $string .= $goods['goods']['title'].':';
         }
-        $digestSecret = self::digest($string . $this->_secret);
+        $digestSecret = self::digest($string.$this->_secret);
         //end function add_transaction_digest
 
         $billing = $this->assembleAddr($this->billing);
@@ -1847,7 +1847,7 @@ 
                 $price *= (1.0 - $discount);
             }
 
-            $amount += $price * (int)$goods['qty'];
+            $amount += $price * (int) $goods['qty'];
         }
         return $amount;
     }
@@ -1923,7 +1923,7 @@ 
             $this->_checkInt($gender, 'gender');
         }
 
-        $this->_checkInt($flags,  'flags');
+        $this->_checkInt($flags, 'flags');
         $this->_checkInt($pclass, 'pclass');
 
         //Check so required information is set.
@@ -1932,7 +1932,7 @@ 
 
         //Calculate automatically the amount from goodsList.
         if ($amount === -1) {
-            $amount = (int)round($this->summarizeGoodsList());
+            $amount = (int) round($this->summarizeGoodsList());
         } else {
             $this->_checkAmount($amount);
         }
@@ -2079,7 +2079,7 @@ 
 
         $result = $this->xmlrpc_call('change_reservation', $paramList);
 
-        return ($result  == 'ok') ? true : false;
+        return ($result == 'ok') ? true : false;
     }
 
     /**
@@ -2393,7 +2393,7 @@ 
 
         //No addresses used for phone transactions
         $billing = $shipping = '';
-        if ( !($flags & KlarnaFlags::RSRV_PHONE_TRANSACTION) ) {
+        if (!($flags & KlarnaFlags::RSRV_PHONE_TRANSACTION)) {
             $billing = $this->assembleAddr($this->billing);
             $shipping = $this->assembleAddr($this->shipping);
 
@@ -2405,11 +2405,11 @@ 
         }
 
         //activate digest
-        $string = $this->_eid . ":" . $pno . ":";
+        $string = $this->_eid.":".$pno.":";
         foreach ($this->goodsList as $goods) {
-            $string .= $goods["goods"]["artno"] . ":" . $goods["qty"] . ":";
+            $string .= $goods["goods"]["artno"].":".$goods["qty"].":";
         }
-        $digestSecret = self::digest($string . $this->_secret);
+        $digestSecret = self::digest($string.$this->_secret);
         //end digest
 
         //Assume normal shipment unless otherwise specified.
@@ -2684,11 +2684,11 @@ 
         self::printDebug('activate_part artNos array', $this->artNos);
 
         //function activate_part_digest
-        $string = $this->_eid . ":" . $invNo . ":";
+        $string = $this->_eid.":".$invNo.":";
         foreach ($this->artNos as $artNo) {
-            $string .= $artNo["artno"] . ":". $artNo["qty"] . ":";
+            $string .= $artNo["artno"].":".$artNo["qty"].":";
         }
-        $digestSecret = self::digest($string . $this->_secret);
+        $digestSecret = self::digest($string.$this->_secret);
         //end activate_part_digest
 
         $paramList = array(
@@ -2943,15 +2943,15 @@ 
         }
 
         //function activate_part_digest
-        $string = $this->_eid . ":" . $invNo . ":";
+        $string = $this->_eid.":".$invNo.":";
 
         if ($this->artNos !== null && !empty($this->artNos)) {
             foreach ($this->artNos as $artNo) {
-                $string .= $artNo["artno"] . ":". $artNo["qty"] . ":";
+                $string .= $artNo["artno"].":".$artNo["qty"].":";
             }
         }
 
-        $digestSecret = self::digest($string . $this->_secret);
+        $digestSecret = self::digest($string.$this->_secret);
         //end activate_part_digest
 
         $paramList = array(
@@ -3114,11 +3114,11 @@ 
         $this->_checkArtNos($this->artNos);
 
         //function activate_part_digest
-        $string = $this->_eid . ":" . $invNo . ":";
+        $string = $this->_eid.":".$invNo.":";
         foreach ($this->artNos as $artNo) {
-            $string .= $artNo["artno"] . ":". $artNo["qty"] . ":";
+            $string .= $artNo["artno"].":".$artNo["qty"].":";
         }
-        $digestSecret = self::digest($string . $this->_secret);
+        $digestSecret = self::digest($string.$this->_secret);
         //end activate_part_digest
 
         $paramList = array(
@@ -3329,7 +3329,7 @@ 
 
         include_once 'pclasses/storage.intf.php';
         $className = $this->pcStorage.'storage';
-        $pclassStorage = dirname(__FILE__) . "/pclasses/{$className}.class.php";
+        $pclassStorage = dirname(__FILE__)."/pclasses/{$className}.class.php";
 
         include_once $pclassStorage;
         $storage = new $className;
@@ -3355,7 +3355,7 @@ 
     private function _fetchPClasses($storage, $country, $language, $currency)
     {
         $digestSecret = self::digest(
-            $this->_eid . ":" . $currency . ":" . $this->_secret
+            $this->_eid.":".$currency.":".$this->_secret
         );
         $paramList = array(
             $this->_eid,
@@ -3430,7 +3430,7 @@ 
             // accidentially removed.
             $pclasses->load($this->pcURI);
         }
-        catch(Exception $e) {
+        catch (Exception $e) {
             self::printDebug('load pclasses', $e->getMessage());
         }
 
@@ -3564,7 +3564,7 @@ 
                     return -1;
                 }
 
-                return strnatcmp($a->getDescription(), $b->getDescription())*-1;
+                return strnatcmp($a->getDescription(), $b->getDescription()) * -1;
             }
         }
         usort($array, "pcCmp");
@@ -3600,7 +3600,7 @@ 
         ) {
             throw new Klarna_InvalidTypeException(
                 'flags',
-                KlarnaFlags::CHECKOUT_PAGE . ' or ' . KlarnaFlags::PRODUCT_PAGE
+                KlarnaFlags::CHECKOUT_PAGE.' or '.KlarnaFlags::PRODUCT_PAGE
             );
         }
 
@@ -3690,7 +3690,7 @@ 
                 ob_start();
             }
             if ($cObj instanceof CheckoutHTML) {
-                $html .= $cObj->toHTML() . "\n";
+                $html .= $cObj->toHTML()."\n";
             }
             if (!self::$debug) {
                 ob_end_clean();
@@ -3780,11 +3780,11 @@ 
 
             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());
         }
     }
@@ -3832,7 +3832,7 @@ 
     {
         $fp = @fsockopen('udp://'.self::$_c_addr, 80, $errno, $errstr, 1500);
         if ($fp) {
-            $uri = "{$this->_url['scheme']}://{$this->_url['host']}" .
+            $uri = "{$this->_url['scheme']}://{$this->_url['host']}".
                     ":{$this->_url['port']}";
 
             $data = $this->pipe(
@@ -3906,7 +3906,7 @@ 
      */
     public static function digest($data, $hash = null)
     {
-        if ($hash===null) {
+        if ($hash === null) {
             $preferred = array(
                 'sha512',
                 'sha384',
@@ -3946,7 +3946,7 @@ 
             self::$htmlentities = array();
             $table = get_html_translation_table(HTML_ENTITIES, ENT_QUOTES);
             foreach ($table as $char => $entity) {
-                self::$htmlentities[$entity] = '&#' . ord($char) . ';';
+                self::$htmlentities[$entity] = '&#'.ord($char).';';
             }
         }
 

Components/Klarna/pclasses/pdostorage.class.php

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
      */
     public function connect($config)
     {
-        if(is_array($config) && $config['pdo'] instanceof PDO) {
+        if (is_array($config) && $config['pdo'] instanceof PDO) {
             $this->pdo = $config['pdo'];
             $this->dbTable = $config['table'];
         } else {

Components/Klarna/pclasses/mysqlstorage.class.php

Spacing +1 added lines, -1 removed lines

@@ -337,7 +337,7 @@
                 "DELETE FROM `{$this->dbName}`.`{$this->dbTable}`",
                 $this->link
             );
-        } catch(Exception $e) {
+        } catch (Exception $e) {
             throw new Klarna_DatabaseException(
                 $e->getMessage(), $e->getCode()
             );