gggeek / phpxmlrpc

demo/client/simple_call.php

Doc Comments -3 removed lines

@@ -24,9 +24,6 @@
 	 *
 	 * @param xmlrpc_client client object, properly set up to connect to server
 	 * @param string remote function name
-	 * @param mixed $parameter1
-	 * @param mixed $parameter2
-	 * @param mixed $parameter3 ...
 	 * @return xmlrpcresp or false on error
 	 */
 	function xmlrpccall_simple()

Braces +1 added lines, -2 removed lines

@@ -35,8 +35,7 @@
 		{
 			// Incorrect
 			return false;
-		}
-		else
+		} else
 		{
 			$varargs = func_get_args();
 			$client = array_shift($varargs);

lib/xmlrpc.inc

Doc Comments +9 added lines, -4 removed lines

@@ -1239,6 +1239,7 @@ 
 

 		/**

 		* @access private

+		* @param integer $port
 		*/

 		function &sendPayloadHTTP10($msg, $server, $port, $timeout=0,

 			$username='', $password='', $authtype=1, $proxyhost='',

@@ -1427,6 +1428,7 @@ 
 

 		/**

 		* @access private

+		* @param integer $port
 		*/

 		function &sendPayloadHTTPS($msg, $server, $port, $timeout=0, $username='',

 			$password='', $authtype=1, $cert='',$certpass='', $cacert='', $cacertdir='',

@@ -1818,6 +1820,8 @@ 
 		* Returns either an array of xmlrpcreponses, an xmlrpc error response

 		* or false (when received response does not respect valid multicall syntax)

 		* @access private

+		* @param integer $timeout
+		* @param string $method
 		*/

 		function _try_multicall($msgs, $timeout, $method)

 		{

@@ -2044,7 +2048,7 @@ 
 

 		/**

 		* Returns the value received by the server.

-		* @return mixed the xmlrpcval object returned by the server. Might be an xml string or php value if the response has been created by specially configured xmlrpc_client objects

+		* @return integer the xmlrpcval object returned by the server. Might be an xml string or php value if the response has been created by specially configured xmlrpc_client objects

 		* @access public

 		*/

 		function value()

@@ -2145,7 +2149,7 @@ 
 

 		/**

 		* @param string $meth the name of the method to invoke

-		* @param array $pars array of parameters to be passed to the method (xmlrpcval objects)

+		* @param integer $pars array of parameters to be passed to the method (xmlrpcval objects)

 		*/

 		function __construct($meth, $pars=0)

 		{

@@ -2302,6 +2306,7 @@ 
 		/**

 		* Parses HTTP headers and separates them from data.

 		* @access private

+		* @param string $data
 		*/

 		function &parseResponseHeaders(&$data, $headers_processed=false)

 		{

@@ -2784,7 +2789,7 @@ 
 		}

 

 		/**

-		* @param mixed $val

+		* @param integer $val

 		* @param string $type any valid xmlrpc type name (lowercase). If null, 'string' is assumed

 		*/

 		function __construct($val=-1, $type='')

@@ -2843,7 +2848,7 @@ 
 

 		/**

 		* Add a single php value to an (unitialized) xmlrpcval

-		* @param mixed $val

+		* @param boolean $val

 		* @param string $type

 		* @return int 1 or 0 on failure

 		*/

Braces +176 added lines, -250 removed lines

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

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

 					return;

-				}

-				else

+				} else

 				{

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

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

 				}

-			}

-			else

+			} else

 			{

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

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

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

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

 						// in the object we're rebuilding

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

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

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

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

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

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

 						{

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

-						}

-						else

+						} else

 						{

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

 						}

-					}

-					else

+					} else

 					{

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

 						/// since std deserializing is done by php_xmlrpc_decode,

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

 					{

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

-					}

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

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

 					{

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

 						{

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

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

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

-					}

-					elseif ($name=='BASE64')

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

 					{

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

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

-					}

-					elseif ($name=='BOOLEAN')

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

 					{

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

 						// constants true or false.

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

 						{

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

-						}

-						else

+						} else

 						{

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

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

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

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

 						}

-					}

-					elseif ($name=='DOUBLE')

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

 					{

 						// we have a DOUBLE

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

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

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

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

-						}

-						else

+						} else

 						{

 							// it's ok, add it on

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

 						}

-					}

-					else

+					} else

 					{

 						// we have an I4/INT

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

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

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

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

-						}

-						else

+						} else

 						{

 							// it's ok, add it on

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

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

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

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

-					} else

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

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

 				case 'DATA':

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

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

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

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

-					}

-					else

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

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

 				case 'METHODNAME':

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

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

 			{

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

-			}

-			else

+			} else

 			{

 				$this->path=$path;

 			}

@@ -998,8 +988,7 @@ 
 			if ($is_dir)

 			{

 				$this->cacertdir = $cacert;

-			}

-			else

+			} else

 			{

 				$this->cacert = $cacert;

 			}

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

 		function setAcceptedCompression($compmethod)

 		{

-			if ($compmethod == 'any')

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

-			else

-				if ($compmethod == false )

-					$this->accepted_compression = array();

-				else

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

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

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

 

 		/**

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

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

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

-			}

-			else

+			} else

 			{

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

 			}

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

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

 				return $r;

-			}

-			elseif(is_string($msg))

+			} elseif(is_string($msg))

 			{

 				$n = new xmlrpcmsg('');

 				$n->payload = $msg;

@@ -1192,8 +1180,7 @@ 
 					$this->key,

 					$this->keypass

 				);

-			}

-			elseif($method == 'http11')

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

 			{

 				$r =& $this->sendPayloadCURL(

 					$msg,

@@ -1215,8 +1202,7 @@ 
 					'http',

 					$this->keepalive

 				);

-			}

-			else

+			} else

 			{

 				$r =& $this->sendPayloadHTTP10(

 					$msg,

@@ -1267,8 +1253,7 @@ 
 						$payload = $a;

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

 					}

-				}

-				else

+				} else

 				{

 					$a = @gzcompress($payload);

 					if($a)

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

 					}

 				}

-			}

-			else

+			} else

 			{

 				$encoding_hdr = '';

 			}

@@ -1318,8 +1302,7 @@ 
 					}

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

 				}

-			}

-			else

+			} else

 			{

 				$connectserver = $server;

 				$connectport = $port;

@@ -1338,14 +1321,16 @@ 
 					{

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

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

-						if ($cookie['path'])

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

-						if ($cookie['domain'])

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

-						if ($cookie['port'])

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

-					}

-					else

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

 					{

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

 					}

@@ -1379,8 +1364,7 @@ 
 			if($timeout>0)

 			{

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

-			}

-			else

+			} else

 			{

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

 			}

@@ -1390,8 +1374,7 @@ 
 				{

 					stream_set_timeout($fp, $timeout);

 				}

-			}

-			else

+			} else

 			{

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

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

@@ -1404,8 +1387,7 @@ 
 				$this->errstr='Write error';

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

 				return $r;

-			}

-			else

+			} else

 			{

 				// reset errno and errstr on successful socket connection

 				$this->errstr = '';

@@ -1472,8 +1454,7 @@ 
 				if($method == 'http')

 				{

 					$port = 80;

-				}

-				else

+				} else

 				{

 					$port = 443;

 				}

@@ -1497,8 +1478,7 @@ 
 						$payload = $a;

 						$encoding_hdr = 'Content-Encoding: gzip';

 					}

-				}

-				else

+				} else

 				{

 					$a = @gzcompress($payload);

 					if($a)

@@ -1507,8 +1487,7 @@ 
 						$encoding_hdr = 'Content-Encoding: deflate';

 					}

 				}

-			}

-			else

+			} else

 			{

 				$encoding_hdr = '';

 			}

@@ -1527,8 +1506,7 @@ 
 				{

 					$this->xmlrpc_curl_handle = $curl;

 				}

-			}

-			else

+			} else

 			{

 				$curl = $this->xmlrpc_curl_handle;

 			}

@@ -1559,9 +1537,9 @@ 
 				if (count($this->accepted_compression) == 1)

 				{

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

-				}

-				else

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

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

 			// extra headers

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

@@ -1589,8 +1567,7 @@ 
 				if (defined('CURLOPT_HTTPAUTH'))

 				{

 					curl_setopt($curl, CURLOPT_HTTPAUTH, $authtype);

-				}

-				else if ($authtype != 1)

+				} else if ($authtype != 1)

 				{

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

 				}

@@ -1655,8 +1632,7 @@ 
 					if (defined('CURLOPT_PROXYAUTH'))

 					{

 						curl_setopt($curl, CURLOPT_PROXYAUTH, $proxyauthtype);

-					}

-					else if ($proxyauthtype != 1)

+					} else if ($proxyauthtype != 1)

 					{

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

 					}

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

 			}

 

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

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

 			{

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

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

 				curl_close($curl);

 				if($keepalive)

 				{

 					$this->xmlrpc_curl_handle = null;

 				}

-			}

-			else

+			} else

 			{

 				if(!$keepalive)

 				{

@@ -1760,8 +1737,7 @@ 
 				{

 					// System.multicall succeeded

 					return $results;

-				}

-				else

+				} else

 				{

 					// either system.multicall is unsupported by server,

 					// or call failed for some other reason.

@@ -1769,21 +1745,18 @@ 
 					{

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

 						$this->no_multicall = true;

-					}

-					else

+					} else

 					{

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

 						{

 							$result = $results;

-						}

-						else

+						} else

 						{

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

 						}

 					}

 				}

-			}

-			else

+			} else

 			{

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

 				// opposite things at the same time

@@ -1799,8 +1772,7 @@ 
 				{

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

 				}

-			}

-			else

+			} else

 			{

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

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

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

 			{

 					return $rets;

-			}

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

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

 			{

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

 				$rets = $result->value();

@@ -1904,8 +1875,7 @@ 
 					}

 				}

 				return $response;

-			}

-			else // return type == 'xmlrpcvals'

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

 			{

 				$rets = $result->value();

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

@@ -1992,8 +1962,7 @@ 
 				$this->errno = $fcode;

 				$this->errstr = $fstr;

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

-			}

-			else

+			} else

 			{

 				// successful response

 				$this->val = $val;

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

 					{

 						$this->valtyp = 'xmlrpcvals';

-					}

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

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

 					{

 						$this->valtyp = 'xml';

 

-					}

-					else

+					} else

 					{

 						$this->valtyp = 'phpvals';

 					}

-				}

-				else

+				} else

 				{

 					// user declares type of resp value: believe him

 					$this->valtyp = $valtyp;

@@ -2076,15 +2042,15 @@ 
 		*/

 		function serialize($charset_encoding='')

 		{

-			if ($charset_encoding != '')

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

-			else

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

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

 			{

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

-			}

-			else

+			} else

 			{

 			$result = "<methodResponse>\n";

 			}

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

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

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

-			}

-			else

+			} else

 			{

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

 				{

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

 							$this->val .

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

-					}

-					else

+					} else

 					{

 						/// @todo try to build something serializable?

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

 					}

-				}

-				else

+				} else

 				{

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

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

@@ -2167,8 +2130,7 @@ 
 			if ($charset_encoding != '')

 			{

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

-			}

-			else

+			} else

 			{

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

 			}

@@ -2195,10 +2157,11 @@ 
 		*/

 		function createPayload($charset_encoding='')

 		{

-			if ($charset_encoding != '')

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

-			else

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

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

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

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

@@ -2252,8 +2215,7 @@ 
 			{

 				$this->params[]=$par;

 				return true;

-			}

-			else

+			} else

 			{

 				return false;

 			}

@@ -2314,15 +2276,13 @@ 
 					if($pos || is_int($pos))

 					{

 						$bd = $pos+4;

-					}

-					else

+					} else

 					{

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

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

 						{

 							$bd = $pos+2;

-						}

-						else

+						} else

 						{

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

 							$bd = 0;

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

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

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

-					}

-					else

+					} else

 					{

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

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

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

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

 					// give the client a chance to know it

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

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

 					{

-						break;

+						break;
+					}
 					}

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

 				}

@@ -2371,15 +2332,13 @@ 
 				if($pos || is_int($pos))

 				{

 					$bd = $pos+4;

-				}

-				else

+				} else

 				{

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

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

 					{

 						$bd = $pos+2;

-					}

-					else

+					} else

 					{

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

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

@@ -2406,8 +2365,7 @@ 
 								// version 2 cookies:

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

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

-							}

-							else

+							} else

 							{

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

 							}

@@ -2415,10 +2373,11 @@ 
 							{

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

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

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

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

-								else

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

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

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

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

@@ -2434,8 +2393,7 @@ 
 										$cookiename = $tag;

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

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

-									}

-									else

+									} else

 									{

 										if ($tag != 'value')

 										{

@@ -2444,13 +2402,11 @@ 
 									}

 								}

 							}

-						}

-						else

+						} else

 						{

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

 						}

-					}

-					elseif(isset($header_name))

+					} elseif(isset($header_name))

 					{

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

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

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

 								{

 									$data = $degzdata;

-									if($this->debug)

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

-								}

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

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

 								{

 									$data = $degzdata;

-									if($this->debug)

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

-								}

-								else

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

 								{

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

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

 									return $r;

 								}

-							}

-							else

+							} else

 							{

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

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

@@ -2570,8 +2525,7 @@ 
 					$r->raw_data = $data;

 					return $r;

 				}

-			}

-			else

+			} else

 			{

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

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

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

 			{

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

-			}

-			else

+			} else

 			{

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

 			}

@@ -2660,8 +2613,7 @@ 
 			if ($return_type == 'phpvals')

 			{

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

-			}

-			else

+			} else

 			{

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

 			}

@@ -2676,8 +2628,7 @@ 
 				if((xml_get_current_line_number($parser)) == 1)

 				{

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

-				}

-				else

+				} else

 				{

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

 						xml_error_string(xml_get_error_code($parser)),

@@ -2716,8 +2667,7 @@ 
 				// indicating something odd went on

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

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

-			}

-			else

+			} else

 			{

 				if ($this->debug)

 				{

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

 						$errno = $errno_v->scalarval();

 						$errstr = $errstr_v->scalarval();

-					}

-					else

+					} else

 					{

 						$errno = $v['faultCode'];

 						$errstr = $v['faultString'];

@@ -2755,8 +2704,7 @@ 
 					}

 

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

-				}

-				else

+				} else

 				{

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

 				}

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

 				{

 					$val=true;

-				}

-				else

+				} else

 				{

 					$val=false;

 				}

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

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

 				return 1;

-			}

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

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

 			{

 				// we're adding to an array here

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

 				return 1;

-			}

-			else

+			} else

 			{

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

 				return 0;

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

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

 				return 1;

-			}

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

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

 			{

 				// we're adding to a struct here

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

 				return 1;

-			}

-			else

+			} else

 			{

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

 				return 0;

@@ -3050,8 +2993,7 @@ 
 							if ($GLOBALS['xmlrpc_null_apache_encoding'])

 							{

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

-							}

-							else

+							} else

 							{

 								$rs.="<nil/>";

 							}

@@ -3067,8 +3009,7 @@ 
 					if ($this->_php_class)

 					{

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

-					}

-					else

+					} else

 					{

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

 					}

@@ -3296,16 +3237,14 @@ 
 		if(!$utc)

 		{

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

-		}

-		else

+		} else

 		{

 			if(function_exists('gmstrftime'))

 			{

 				// gmstrftime doesn't exist in some versions

 				// of PHP

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

-			}

-			else

+			} else

 			{

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

 			}

@@ -3327,8 +3266,7 @@ 
 			if($utc)

 			{

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

-			}

-			else

+			} else

 			{

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

 			}

@@ -3396,8 +3334,7 @@ 
 						$result = new Datetime();

 						$result->setTimestamp($out);

 						return $result;

-					}

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

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

 					{

 						return $out;

 					}

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

 					}

 					return $obj;

-				}

-				else

+				} else

 				{

 					$arr = array();

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

@@ -3453,8 +3389,7 @@ 
 	if(function_exists('xmlrpc_decode'))

 	{

 		define('XMLRPC_EPI_ENABLED','1');

-	}

-	else

+	} else

 	{

 		define('XMLRPC_EPI_ENABLED','0');

 	}

@@ -3482,10 +3417,11 @@ 
 		switch($type)

 		{

 			case 'string':

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

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

-				else

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

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

 			case 'integer':

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

@@ -3520,8 +3456,7 @@ 
 				if($ko)

 				{

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

-				}

-				else

+				} else

 				{

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

 				}

@@ -3530,12 +3465,10 @@ 
 				if(is_a($php_val, 'xmlrpcval'))

 				{

 					$xmlrpc_val = $php_val;

-				}

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

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

 				{

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

-				}

-				else

+				} else

 				{

 					$arr = array();

 					reset($php_val);

@@ -3556,12 +3489,10 @@ 
 				if (in_array('extension_api', $options))

 				{

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

-				}

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

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

 				{

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

-				}

-				else

+				} else

 				{

 					$xmlrpc_val = new xmlrpcval();

 				}

@@ -3570,8 +3501,7 @@ 
 				if (in_array('extension_api', $options))

 				{

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

-				}

-				else

+				} else

 				{

 					$xmlrpc_val = new xmlrpcval();

 				}

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

 		{

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

-		}

-		else

+		} else

 		{

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

 		}

@@ -3651,9 +3580,11 @@ 
 			return false;

 		}

 		xml_parser_free($parser);

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

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

 		{

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

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

 		}

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

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

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

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

-				}

-				else

+				} else

 				{

 					$r = new xmlrpcresp($v);

 				}

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

 		{

 			return 'UCS-4';

-		}

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

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

 		{

 			return 'UTF-16';

-		}

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

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

 		{

 			return 'UTF-8';

 		}

@@ -3815,8 +3743,7 @@ 
 			if($encoding_prefs)

 			{

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

-			}

-			else

+			} else

 			{

 				$enc = mb_detect_encoding($xmlchunk);

 			}

@@ -3827,8 +3754,7 @@ 
 				$enc = 'US-'.$enc;

 			}

 			return $enc;

-		}

-		else

+		} else

 		{

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

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

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

 		{

 			return true;

-		}

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

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

 		{

 			return true;

-		}

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

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

 		{

 			return true;

 		}

@@ -3891,16 +3815,18 @@ 
 				'ISO-8859-13', 'ISO-8859-14', 'ISO-8859-15', 'UTF-8',

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

 		);

-		if (is_string($validlist))

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

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

-			return true;

-		else

-		{

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

-				foreach ($validlist as $allowed)

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

+		{

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

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

-						return true;

+						return true;
+			}
 			return false;

 		}

 	}

lib/xmlrpc_wrappers.inc

Doc Comments +3 added lines, -1 removed lines

@@ -536,7 +536,7 @@ 
 	*

 	* @param xmlrpc_client $client     an xmlrpc client set up correctly to communicate with target server

 	* @param string        $methodname the xmlrpc method to be mapped to a php function

-	* @param array         $extra_options array of options that specify conversion details. valid options include

+	* @param integer         $extra_options array of options that specify conversion details. valid options include

 	*        integer       signum      the index of the method signature to use in mapping (if method exposes many sigs)

 	*        integer       timeout     timeout (in secs) to be used when executing function/calling remote method

 	*        string        protocol    'http' (default), 'http11' or 'https'

@@ -805,6 +805,8 @@ 
 	* valid php code is emitted.

 	* Note: real spaghetti code follows...

 	* @access private

+	* @param xmlrpc_client $client
+	* @param string $methodname
 	*/

 	function build_remote_method_wrapper_code($client, $methodname, $xmlrpcfuncname,

 		$msig, $mdesc='', $timeout=0, $protocol='', $client_copy_mode=0, $prefix='xmlrpc',

Braces +46 added lines, -80 removed lines

@@ -52,8 +52,7 @@ 
 				if(class_exists($phptype))

 				{

 					return $GLOBALS['xmlrpcStruct'];

-				}

-				else

+				} else

 				{

 					// unknown: might be any 'extended' xmlrpc type

 					return $GLOBALS['xmlrpcValue'];

@@ -163,14 +162,12 @@ 
 			if(is_string($funcname[0]))

 			{

 				$plainfuncname = implode('::', $funcname);

-			}

-			elseif(is_object($funcname[0]))

+			} elseif(is_object($funcname[0]))

 			{

 				$plainfuncname = get_class($funcname[0]) . '->' . $funcname[1];

 			}

 			$exists = method_exists($funcname[0], $funcname[1]);

-		}

-		else

+		} else

 		{

 			$plainfuncname = $funcname;

 			$exists = function_exists($funcname);

@@ -180,25 +177,23 @@ 
 		{

 			error_log('XML-RPC: function to be wrapped is not defined: '.$plainfuncname);

 			return false;

-		}

-		else

+		} else

 		{

 			// determine name of new php function

 			if($newfuncname == '')

 			{

 				if(is_array($funcname))

 				{

-					if(is_string($funcname[0]))

-						$xmlrpcfuncname = "{$prefix}_".implode('_', $funcname);

-					else

-						$xmlrpcfuncname = "{$prefix}_".get_class($funcname[0]) . '_' . $funcname[1];

-				}

-				else

+					if(is_string($funcname[0])) {
+											$xmlrpcfuncname = "{$prefix}_".implode('_', $funcname);
+					} else {
+											$xmlrpcfuncname = "{$prefix}_".get_class($funcname[0]) . '_' . $funcname[1];
+					}
+				} else

 				{

 					$xmlrpcfuncname = "{$prefix}_$funcname";

 				}

-			}

-			else

+			} else

 			{

 				$xmlrpcfuncname = $newfuncname;

 			}

@@ -237,8 +232,7 @@ 
 					return false;

 				}

 				/// @todo add more checks for static vs. nonstatic?

-			}

-			else

+			} else

 			{

 				$func = new ReflectionFunction($funcname);

 			}

@@ -276,8 +270,7 @@ 
 							$desc .= "\n";

 						}

 						$desc .= $doc;

-					}

-					elseif(strpos($doc, '@param') === 0)

+					} elseif(strpos($doc, '@param') === 0)

 					{

 						// syntax: @param type [$name] desc

 						if(preg_match('/@param\s+(\S+)(\s+\$\S+)?\s+(.+)/', $doc, $matches))

@@ -286,8 +279,7 @@ 
 							{

 								//$paramDocs[$i]['type'] = explode('|', $matches[1]);

 								$paramDocs[$i]['type'] = 'mixed';

-							}

-							else

+							} else

 							{

 								$paramDocs[$i]['type'] = $matches[1];

 							}

@@ -295,8 +287,7 @@ 
 							$paramDocs[$i]['doc'] = $matches[3];

 						}

 						$i++;

-					}

-					elseif(strpos($doc, '@return') === 0)

+					} elseif(strpos($doc, '@return') === 0)

 					{

 						// syntax: @return type desc

 						//$returns = preg_split('/\s+/', $doc);

@@ -348,8 +339,7 @@ 
 				if ($decode_php_objects)

 				{

 					$innercode .= "if (\$p{$i}->kindOf() == 'scalar') \$p$i = \$p{$i}->scalarval(); else \$p$i = php_{$prefix}_decode(\$p$i, array('decode_php_objs'));\n";

-				}

-				else

+				} else

 				{

 					$innercode .= "if (\$p{$i}->kindOf() == 'scalar') \$p$i = \$p{$i}->scalarval(); else \$p$i = php_{$prefix}_decode(\$p$i);\n";

 				}

@@ -374,8 +364,7 @@ 
 				// only known good synopsis = no parameters

 				$parsvariations[] = array();

 				$minpars = 0;

-			}

-			else

+			} else

 			{

 				$minpars = count($parsvariations[0]);

 			}

@@ -386,8 +375,7 @@ 
 				// NB: this check needs to be done BEFORE decoding param values

 				$innercode = "\$paramcount = \$msg->getNumParams();\n" .

 				"if (\$paramcount < $minpars) return new {$prefix}resp(0, {$GLOBALS['xmlrpcerr']['incorrect_params']}, '{$GLOBALS['xmlrpcstr']['incorrect_params']}');\n" . $innercode;

-			}

-			else

+			} else

 			{

 				$innercode = "\$paramcount = \$msg->getNumParams();\n" . $innercode;

 			}

@@ -400,8 +388,7 @@ 
 				$GLOBALS['xmlrpcWPFObjHolder'][$xmlrpcfuncname] =& $funcname[0];

 				$innercode .= "\$obj =& \$GLOBALS['xmlrpcWPFObjHolder']['$xmlrpcfuncname'];\n";

 				$realfuncname = '$obj->'.$funcname[1];

-			}

-			else

+			} else

 			{

 				$realfuncname = $plainfuncname;

 			}

@@ -416,8 +403,7 @@ 
 					if (isset($paramDocs[$i]['type']))

 					{

 						$sig[] = php_2_xmlrpc_type($paramDocs[$i]['type']);

-					}

-					else

+					} else

 					{

 						$sig[] = $GLOBALS['xmlrpcValue'];

 					}

@@ -433,13 +419,13 @@ 
 			if($returns == $GLOBALS['xmlrpcDateTime'] || $returns == $GLOBALS['xmlrpcBase64'])

 			{

 				$innercode .= "return new {$prefix}resp(new {$prefix}val(\$retval, '$returns'));";

-			}

-			else

+			} else

 			{

-				if ($encode_php_objects)

-					$innercode .= "return new {$prefix}resp(php_{$prefix}_encode(\$retval, array('encode_php_objs')));\n";

-				else

-					$innercode .= "return new {$prefix}resp(php_{$prefix}_encode(\$retval));\n";

+				if ($encode_php_objects) {
+									$innercode .= "return new {$prefix}resp(php_{$prefix}_encode(\$retval, array('encode_php_objs')));\n";
+				} else {
+									$innercode .= "return new {$prefix}resp(php_{$prefix}_encode(\$retval));\n";
+				}
 			}

 			// shall we exclude functions returning by ref?

 			// if($func->returnsReference())

@@ -556,8 +542,7 @@ 
 		{

 			$signum = $extra_options;

 			$extra_options = array();

-		}

-		else

+		} else

 		{

 			$signum = isset($extra_options['signum']) ? (int)$extra_options['signum'] : 0;

 			$timeout = isset($extra_options['timeout']) ? (int)$extra_options['timeout'] : 0;

@@ -578,8 +563,7 @@ 
 		{

 			$decode_fault = true;

 			$fault_response = $extra_options['return_on_fault'];

-		}

-		else

+		} else

 		{

 			$decode_fault = false;

 			$fault_response = '';

@@ -598,8 +582,7 @@ 
 		{

 			error_log('XML-RPC: could not retrieve method signature from remote server for method '.$methodname);

 			return false;

-		}

-		else

+		} else

 		{

 			$msig = $response->value();

 			if ($client->return_type != 'phpvals')

@@ -610,15 +593,13 @@ 
 			{

 				error_log('XML-RPC: could not retrieve method signature nr.'.$signum.' from remote server for method '.$methodname);

 				return false;

-			}

-			else

+			} else

 			{

 				// pick a suitable name for the new function, avoiding collisions

 				if($newfuncname != '')

 				{

 					$xmlrpcfuncname = $newfuncname;

-				}

-				else

+				} else

 				{

 					// take care to insure that methodname is translated to valid

 					// php function name

@@ -664,14 +645,12 @@ 
 					if($allOK)

 					{

 						return $xmlrpcfuncname;

-					}

-					else

+					} else

 					{

 						error_log('XML-RPC: could not create function '.$xmlrpcfuncname.' to wrap remote method '.$methodname);

 						return false;

 					}

-				}

-				else

+				} else

 				{

 					$results['function'] = $xmlrpcfuncname;

 					return $results;

@@ -711,8 +690,7 @@ 
 		{

 			error_log('XML-RPC: could not retrieve method list from remote server');

 			return false;

-		}

-		else

+		} else

 		{

 			$mlist = $response->value();

 			if ($client->return_type != 'phpvals')

@@ -723,15 +701,13 @@ 
 			{

 				error_log('XML-RPC: could not retrieve meaningful method list from remote server');

 				return false;

-			}

-			else

+			} else

 			{

 				// pick a suitable name for the new function, avoiding collisions

 				if($newclassname != '')

 				{

 					$xmlrpcclassname = $newclassname;

-				}

-				else

+				} else

 				{

 					$xmlrpcclassname = $prefix.'_'.preg_replace(array('/\./', '/[^a-zA-Z0-9_\x7f-\xff]/'),

 						array('_', ''), $client->server).'_client';

@@ -766,8 +742,7 @@ 
 								$source .= $methodwrap['docstring'];

 							}

 							$source .= $methodwrap['source']."\n";

-						}

-						else

+						} else

 						{

 							error_log('XML-RPC: will not create class method to wrap remote method '.$mname);

 						}

@@ -783,14 +758,12 @@ 
 					if($allOK)

 					{

 						return $xmlrpcclassname;

-					}

-					else

+					} else

 					{

 						error_log('XML-RPC: could not create class '.$xmlrpcclassname.' to wrap remote server '.$client->server);

 						return false;

 					}

-				}

-				else

+				} else

 				{

 					return array('class' => $xmlrpcclassname, 'code' => $source, 'docstring' => '');

 				}

@@ -818,8 +791,7 @@ 
 			$innercode = build_client_wrapper_code($client, $client_copy_mode, $prefix);

 			$innercode .= "\$client->setDebug(\$debug);\n";

 			$this_ = '';

-		}

-		else

+		} else

 		{

 			// client copy mode 2 == no client copy in emitted code

 			$innercode = '';

@@ -831,8 +803,7 @@ 
 		{

 			// take care that PHP comment is not terminated unwillingly by method description

 			$mdesc = "/**\n* ".str_replace('*/', '* /', $mdesc)."\n";

-		}

-		else

+		} else

 		{

 			$mdesc = "/**\nFunction $xmlrpcfuncname\n";

 		}

@@ -849,14 +820,12 @@ 
 			{

 				// only build directly xmlrpcvals when type is known and scalar

 				$innercode .= "\$p$i = new {$prefix}val(\$p$i, '$ptype');\n";

-			}

-			else

+			} else

 			{

 				if ($encode_php_objects)

 				{

 					$innercode .= "\$p$i =& php_{$prefix}_encode(\$p$i, array('encode_php_objs'));\n";

-				}

-				else

+				} else

 				{

 					$innercode .= "\$p$i =& php_{$prefix}_encode(\$p$i);\n";

 				}

@@ -878,21 +847,18 @@ 
 			if (is_string($fault_response) && ((strpos($fault_response, '%faultCode%') !== false) || (strpos($fault_response, '%faultString%') !== false)))

 			{

 				$respcode = "str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '".str_replace("'", "''", $fault_response)."')";

-			}

-			else

+			} else

 			{

 				$respcode = var_export($fault_response, true);

 			}

-		}

-		else

+		} else

 		{

 			$respcode = '$res';

 		}

 		if ($decode_php_objects)

 		{

 			$innercode .= "if (\$res->faultcode()) return $respcode; else return php_{$prefix}_decode(\$res->value(), array('decode_php_objs'));";

-		}

-		else

+		} else

 		{

 			$innercode .= "if (\$res->faultcode()) return $respcode; else return php_{$prefix}_decode(\$res->value());";

 		}

lib/xmlrpcs.inc

Doc Comments +4 added lines, -3 removed lines

@@ -502,8 +502,8 @@ 
 		}

 

 		/**

-		* @param array $dispmap the dispatch map with definition of exposed services

-		* @param boolean $servicenow set to false to prevent the server from running upon construction

+		* @param array $dispMap the dispatch map with definition of exposed services

+		* @param boolean $serviceNow set to false to prevent the server from running upon construction

 		*/

 		function __construct($dispMap=null, $serviceNow=true)

 		{

@@ -785,7 +785,8 @@ 
 

 		/**

 		* Parse http headers received along with xmlrpc request. If needed, inflate request

-		* @return mixed null on success or an xmlrpcresp

+		* @param string $data
+		* @return xmlrpcresp|null null on success or an xmlrpcresp

 		* @access private

 		*/

 		function parseRequestHeaders(&$data, &$req_encoding, &$resp_encoding, &$resp_compression)

Braces +58 added lines, -89 removed lines

@@ -106,16 +106,14 @@ 
 		{

 			$methName=$m->getParam(0);

 			$methName=$methName->scalarval();

-		}

-		else

+		} else

 		{

 			$methName=$m;

 		}

 		if(strpos($methName, "system.") === 0)

 		{

 			$dmap=$GLOBALS['_xmlrpcs_dmap']; $sysCall=1;

-		}

-		else

+		} else

 		{

 			$dmap=$server->dmap; $sysCall=0;

 		}

@@ -134,15 +132,13 @@ 
 					$sigs[]=new xmlrpcval($cursig, 'array');

 				}

 				$r=new xmlrpcresp(new xmlrpcval($sigs, 'array'));

-			}

-			else

+			} else

 			{

 				// NB: according to the official docs, we should be returning a

 				// "none-array" here, which means not-an-array

 				$r=new xmlrpcresp(new xmlrpcval('undef', 'string'));

 			}

-		}

-		else

+		} else

 		{

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

 		}

@@ -159,16 +155,14 @@ 
 		{

 			$methName=$m->getParam(0);

 			$methName=$methName->scalarval();

-		}

-		else

+		} else

 		{

 			$methName=$m;

 		}

 		if(strpos($methName, "system.") === 0)

 		{

 			$dmap=$GLOBALS['_xmlrpcs_dmap']; $sysCall=1;

-		}

-		else

+		} else

 		{

 			$dmap=$server->dmap; $sysCall=0;

 		}

@@ -177,13 +171,11 @@ 
 			if(isset($dmap[$methName]['docstring']))

 			{

 				$r=new xmlrpcresp(new xmlrpcval($dmap[$methName]['docstring']), 'string');

-			}

-			else

+			} else

 			{

 				$r=new xmlrpcresp(new xmlrpcval('', 'string'));

 			}

-		}

-		else

+		} else

 		{

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

 		}

@@ -295,8 +287,9 @@ 
 		// base64 or datetime values, but they will be listed as strings here...

 		$numParams = count($call['params']);

 		$pt = array();

-		foreach($call['params'] as $val)

-			$pt[] = php_2_xmlrpc_type(gettype($val));

+		foreach($call['params'] as $val) {
+					$pt[] = php_2_xmlrpc_type(gettype($val));
+		}
 

 		$result = $server->execute($call['methodName'], $call['params'], $pt);

 

@@ -321,8 +314,7 @@ 
 				$call = $calls->arraymem($i);

 				$result[$i] = _xmlrpcs_multicall_do_call($server, $call);

 			}

-		}

-		else

+		} else

 		{

 			$numCalls=count($m);

 			for($i = 0; $i < $numCalls; $i++)

@@ -377,8 +369,9 @@ 
 	function _xmlrpcs_errorHandler($errcode, $errstring, $filename=null, $lineno=null, $context=null)

 	{

 		// obey the @ protocol

-		if (error_reporting() == 0)

-			return;

+		if (error_reporting() == 0) {
+					return;
+		}
 

 		//if($errcode != E_NOTICE && $errcode != E_WARNING && $errcode != E_USER_NOTICE && $errcode != E_USER_WARNING)

 		if($errcode != E_STRICT)

@@ -395,8 +388,7 @@ 
 			{

 				error_log($errstring);

 			}

-		}

-		else

+		} else

 		{

 			// Pass control on to previous error handler, trying to avoid loops...

 			if($GLOBALS['_xmlrpcs_prev_ehandler'] != '_xmlrpcs_errorHandler')

@@ -406,8 +398,7 @@ 
 				{

 					// the following works both with static class methods and plain object methods as error handler

 					call_user_func_array($GLOBALS['_xmlrpcs_prev_ehandler'], array($errcode, $errstring, $filename, $lineno, $context));

-				}

-				else

+				} else

 				{

 					$GLOBALS['_xmlrpcs_prev_ehandler']($errcode, $errstring, $filename, $lineno, $context);

 				}

@@ -663,8 +654,7 @@ 
 						$payload = gzencode($payload);

 						header("Content-Encoding: gzip");

 						header("Vary: Accept-Encoding");

-					}

-					elseif (strpos($resp_encoding, 'deflate') !== false)

+					} elseif (strpos($resp_encoding, 'deflate') !== false)

 					{

 						$payload = gzcompress($payload);

 						header("Content-Encoding: deflate");

@@ -678,8 +668,7 @@ 
 				{

 					header('Content-Length: ' . (int)strlen($payload));

 				}

-			}

-			else

+			} else

 			{

 				error_log('XML-RPC: '.__METHOD__.': http headers already sent before response is fully generated. Check for php warning or error messages');

 			}

@@ -728,8 +717,7 @@ 
 			if (is_object($in))

 			{

 				$numParams = $in->getNumParams();

-			}

-			else

+			} else

 			{

 				$numParams = count($in);

 			}

@@ -746,13 +734,11 @@ 
 							if($p->kindOf() == 'scalar')

 							{

 								$pt=$p->scalartyp();

-							}

-							else

+							} else

 							{

 								$pt=$p->kindOf();

 							}

-						}

-						else

+						} else

 						{

 							$pt= $in[$n] == 'i4' ? 'int' : strtolower($in[$n]); // dispatch maps never use i4...

 						}

@@ -813,8 +799,7 @@ 
 			if(isset($_SERVER['HTTP_CONTENT_ENCODING']))

 			{

 				$content_encoding = str_replace('x-', '', $_SERVER['HTTP_CONTENT_ENCODING']);

-			}

-			else

+			} else

 			{

 				$content_encoding = '';

 			}

@@ -834,20 +819,18 @@ 
 							{

 								$this->debugmsg("\n+++INFLATED REQUEST+++[".strlen($data)." chars]+++\n" . $data . "\n+++END+++");

 							}

-						}

-						elseif($content_encoding == 'gzip' && $degzdata = @gzinflate(substr($data, 10)))

+						} elseif($content_encoding == 'gzip' && $degzdata = @gzinflate(substr($data, 10)))

 						{

 							$data = $degzdata;

-							if($this->debug > 1)

-								$this->debugmsg("+++INFLATED REQUEST+++[".strlen($data)." chars]+++\n" . $data . "\n+++END+++");

-						}

-						else

+							if($this->debug > 1) {
+															$this->debugmsg("+++INFLATED REQUEST+++[".strlen($data)." chars]+++\n" . $data . "\n+++END+++");
+							}
+						} else

 						{

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

 							return $r;

 						}

-					}

-					else

+					} else

 					{

 						//error_log('The server sent deflated data. Your php install must have the Zlib extension compiled in to support this.');

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

@@ -871,18 +854,19 @@ 
 					$known_charsets = array($GLOBALS['xmlrpc_internalencoding'], 'UTF-8', 'ISO-8859-1', 'US-ASCII');

 					foreach ($known_charsets as $charset)

 					{

-						foreach ($client_accepted_charsets as $accepted)

-							if (strpos($accepted, $charset) === 0)

+						foreach ($client_accepted_charsets as $accepted) {
+													if (strpos($accepted, $charset) === 0)

 							{

-								$resp_encoding = $charset;

+								$resp_encoding = $charset;
+						}
 								break;

 							}

-						if ($resp_encoding)

-							break;

+						if ($resp_encoding) {
+													break;
+						}
 					}

 				}

-			}

-			else

+			} else

 			{

 				$resp_encoding = $this->response_charset_encoding;

 			}

@@ -890,8 +874,7 @@ 
 			if (isset($_SERVER['HTTP_ACCEPT_ENCODING']))

 			{

 				$resp_compression = $_SERVER['HTTP_ACCEPT_ENCODING'];

-			}

-			else

+			} else

 			{

 				$resp_compression = '';

 			}

@@ -968,16 +951,16 @@ 
 			if (!in_array($GLOBALS['xmlrpc_internalencoding'], array('UTF-8', 'ISO-8859-1', 'US-ASCII')))

 			{

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

-			}

-			else

+			} else

 			{

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

 			}

 

-			if ($this->functions_parameters_type != 'xmlrpcvals')

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

-			else

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

+			if ($this->functions_parameters_type != 'xmlrpcvals') {
+							xml_set_element_handler($parser, 'xmlrpc_se', 'xmlrpc_ee_fast');
+			} else {
+							xml_set_element_handler($parser, 'xmlrpc_se', 'xmlrpc_ee');
+			}
 			xml_set_character_data_handler($parser, 'xmlrpc_cd');

 			xml_set_default_handler($parser, 'xmlrpc_dh');

 			if(!xml_parse($parser, $data, 1))

@@ -989,15 +972,13 @@ 
 					xml_error_string(xml_get_error_code($parser)),

 					xml_get_current_line_number($parser), xml_get_current_column_number($parser)));

 				xml_parser_free($parser);

-			}

-			elseif ($GLOBALS['_xh']['isf'])

+			} elseif ($GLOBALS['_xh']['isf'])

 			{

 				xml_parser_free($parser);

 				$r=new xmlrpcresp(0,

 					$GLOBALS['xmlrpcerr']['invalid_request'],

 					$GLOBALS['xmlrpcstr']['invalid_request'] . ' ' . $GLOBALS['_xh']['isf_reason']);

-			}

-			else

+			} else

 			{

 				xml_parser_free($parser);

 				// small layering violation in favor of speed and memory usage:

@@ -1011,8 +992,7 @@ 
 						$this->debugmsg("\n+++PARSED+++\n".var_export($GLOBALS['_xh']['params'], true)."\n+++END+++");

 					}

 					$r = $this->execute($GLOBALS['_xh']['method'], $GLOBALS['_xh']['params'], $GLOBALS['_xh']['pt']);

-				}

-				else

+				} else

 				{

 					// build an xmlrpcmsg object with data parsed from xml

 					$m=new xmlrpcmsg($GLOBALS['_xh']['method']);

@@ -1045,8 +1025,7 @@ 
 			if (is_object($m))

 			{

 				$methName = $m->method();

-			}

-			else

+			} else

 			{

 				$methName = $m;

 			}

@@ -1068,8 +1047,7 @@ 
 				if (is_object($m))

 				{

 					list($ok, $errstr) = $this->verifySignature($m, $sig);

-				}

-				else

+				} else

 				{

 					list($ok, $errstr) = $this->verifySignature($paramtypes, $sig);

 				}

@@ -1115,8 +1093,7 @@ 
 					if($sysCall)

 					{

 						$r = call_user_func($func, $this, $m);

-					}

-					else

+					} else

 					{

 						$r = call_user_func($func, $m);

 					}

@@ -1126,8 +1103,7 @@ 
 						if (is_a($r, 'xmlrpcval'))

 						{

 							$r = new xmlrpcresp($r);

-						}

-						else

+						} else

 						{

 							$r = new xmlrpcresp(

 								0,

@@ -1136,16 +1112,14 @@ 
 							);

 						}

 					}

-				}

-				else

+				} else

 				{

 					// call a 'plain php' function

 					if($sysCall)

 					{

 						array_unshift($params, $this);

 						$r = call_user_func_array($func, $params);

-					}

-					else

+					} else

 					{

 						// 3rd API convention for method-handling functions: EPI-style

 						if ($this->functions_parameters_type == 'epivals')

@@ -1156,15 +1130,13 @@ 
 							if (is_array($r) && array_key_exists('faultCode', $r) && array_key_exists('faultString', $r))

 							{

 								$r = new xmlrpcresp(0, (integer)$r['faultCode'], (string)$r['faultString']);

-							}

-							else

+							} else

 							{

 								// functions using EPI api should NOT return resp objects,

 								// so make sure we encode the return type correctly

 								$r = new xmlrpcresp(php_xmlrpc_encode($r, array('extension_api')));

 							}

-						}

-						else

+						} else

 						{

 							$r = call_user_func_array($func, $params);

 						}

@@ -1177,8 +1149,7 @@ 
 						$r = new xmlrpcresp(php_xmlrpc_encode($r, $this->phpvals_encoding_options));

 					}

 				}

-			}

-			catch(Exception $e)

+			} catch(Exception $e)

 			{

 				// (barring errors in the lib) an uncatched exception happened

 				// in the called function, we wrap it in a proper error-response

@@ -1201,8 +1172,7 @@ 
 				if($GLOBALS['_xmlrpcs_prev_ehandler'])

 				{

 					set_error_handler($GLOBALS['_xmlrpcs_prev_ehandler']);

-				}

-				else

+				} else

 				{

 					restore_error_handler();

 				}

@@ -1228,8 +1198,7 @@ 
 			if ($charset_encoding != '')

 			{

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

-			}

-			else

+			} else

 			{

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

 			}

debugger/common.php

Braces +40 added lines, -31 removed lines

@@ -42,15 +42,17 @@ 
     if (isset($_GET['wstype']) && $_GET['wstype'] == '1')
     {
       $wstype = 1;
-      if (isset($_GET['id']))
-        $id = $_GET['id'];
+      if (isset($_GET['id'])) {
+              $id = $_GET['id'];
+      }
     }
     $host = isset($_GET['host']) ? $_GET['host'] : 'localhost'; // using '' will trigger an xmlrpc error...
-    if (isset($_GET['protocol']) && ($_GET['protocol'] == '1' || $_GET['protocol'] == '2'))
-      $protocol = $_GET['protocol'];
-    if (strpos($host, 'http://') === 0)
-      $host = substr($host, 7);
-    else if (strpos($host, 'https://') === 0)
+    if (isset($_GET['protocol']) && ($_GET['protocol'] == '1' || $_GET['protocol'] == '2')) {
+          $protocol = $_GET['protocol'];
+    }
+    if (strpos($host, 'http://') === 0) {
+          $host = substr($host, 7);
+    } else if (strpos($host, 'https://') === 0)
     {
       $host = substr($host, 8);
       $protocol = 2;
@@ -58,26 +60,31 @@ 
     $port = isset($_GET['port']) ? $_GET['port'] : '';
     $path = isset($_GET['path']) ? $_GET['path'] : '';
     // in case user forgot initial '/' in xmlrpc server path, add it back
-    if ($path && ($path[0]) != '/')
-      $path = '/'.$path;
+    if ($path && ($path[0]) != '/') {
+          $path = '/'.$path;
+    }
 
-    if (isset($_GET['debug']) && ($_GET['debug'] == '1' || $_GET['debug'] == '2'))
-      $debug = $_GET['debug'];
+    if (isset($_GET['debug']) && ($_GET['debug'] == '1' || $_GET['debug'] == '2')) {
+          $debug = $_GET['debug'];
+    }
 
     $verifyhost = (isset($_GET['verifyhost']) && ($_GET['verifyhost'] == '1' || $_GET['verifyhost'] == '2')) ? $_GET['verifyhost'] : 0;
-    if (isset($_GET['verifypeer']) && $_GET['verifypeer'] == '1')
-      $verifypeer = true;
-    else
-      $verifypeer = false;
+    if (isset($_GET['verifypeer']) && $_GET['verifypeer'] == '1') {
+          $verifypeer = true;
+    } else {
+          $verifypeer = false;
+    }
     $cainfo= isset($_GET['cainfo']) ? $_GET['cainfo'] : '';
     $proxy = isset($_GET['proxy']) ? $_GET['proxy'] : 0;
-    if (strpos($proxy, 'http://') === 0)
-      $proxy = substr($proxy, 7);
+    if (strpos($proxy, 'http://') === 0) {
+          $proxy = substr($proxy, 7);
+    }
     $proxyuser= isset($_GET['proxyuser']) ? $_GET['proxyuser'] : '';
     $proxypwd = isset($_GET['proxypwd']) ? $_GET['proxypwd'] : '';
     $timeout = isset($_GET['timeout']) ? $_GET['timeout'] : 0;
-    if (!is_numeric($timeout))
-      $timeout = 0;
+    if (!is_numeric($timeout)) {
+          $timeout = 0;
+    }
     $action = $_GET['action'];
 
     $method = isset($_GET['method']) ? $_GET['method'] : '';
@@ -85,26 +92,28 @@ 
     $payload = isset($_GET['methodpayload']) ? $_GET['methodpayload'] : '';
     $alt_payload = isset($_GET['altmethodpayload']) ? $_GET['altmethodpayload'] : '';
 
-    if (isset($_GET['run']) && $_GET['run'] == 'now')
-      $run = true;
+    if (isset($_GET['run']) && $_GET['run'] == 'now') {
+          $run = true;
+    }
 
     $username = isset($_GET['username']) ? $_GET['username'] : '';
     $password = isset($_GET['password']) ? $_GET['password'] : '';
 
     $authtype = (isset($_GET['authtype']) && ($_GET['authtype'] == '2' || $_GET['authtype'] == '8')) ? $_GET['authtype'] : 1;
 
-    if (isset($_GET['requestcompression']) && ($_GET['requestcompression'] == '1' || $_GET['requestcompression'] == '2'))
-      $requestcompression = $_GET['requestcompression'];
-    else
-      $requestcompression = 0;
-    if (isset($_GET['responsecompression']) && ($_GET['responsecompression'] == '1' || $_GET['responsecompression'] == '2' || $_GET['responsecompression'] == '3'))
-      $responsecompression = $_GET['responsecompression'];
-    else
-      $responsecompression = 0;
+    if (isset($_GET['requestcompression']) && ($_GET['requestcompression'] == '1' || $_GET['requestcompression'] == '2')) {
+          $requestcompression = $_GET['requestcompression'];
+    } else {
+          $requestcompression = 0;
+    }
+    if (isset($_GET['responsecompression']) && ($_GET['responsecompression'] == '1' || $_GET['responsecompression'] == '2' || $_GET['responsecompression'] == '3')) {
+          $responsecompression = $_GET['responsecompression'];
+    } else {
+          $responsecompression = 0;
+    }
 
     $clientcookies = isset($_GET['clientcookies']) ? $_GET['clientcookies'] : '';
-  }
-  else
+  } else
   {
     $host = '';
     $port = '';

debugger/action.php

Braces +62 added lines, -53 removed lines

@@ -41,8 +41,9 @@ 
   {
 
     // make sure the script waits long enough for the call to complete...
-    if ($timeout)
-      set_time_limit($timeout+10);
+    if ($timeout) {
+          set_time_limit($timeout+10);
+    }
 
     include('xmlrpc.inc');
     if ($wstype == 1)
@@ -55,8 +56,7 @@ 
       $clientclass = 'jsonrpc_client';
       $msgclass = 'jsonrpcmsg';
       $protoname = 'JSONRPC';
-    }
-    else
+    } else
     {
       $clientclass = 'xmlrpc_client';
       $msgclass = 'xmlrpcmsg';
@@ -74,17 +74,17 @@ 
     if ($protocol == 2)
     {
       $server = 'https://'.$server;
-    }
-    else
+    } else
     {
       $server = 'http://'.$server;
     }
     if ($proxy != '') {
       $pproxy = explode(':', $proxy);
-      if (count($pproxy) > 1)
-        $pport = $pproxy[1];
-      else
-        $pport = 8080;
+      if (count($pproxy) > 1) {
+              $pport = $pproxy[1];
+      } else {
+              $pport = 8080;
+      }
       $client->setProxy($pproxy[0], $pport, $proxyuser, $proxypwd);
     }
 
@@ -97,14 +97,15 @@ 
         $client->setCaCertificate($cainfo);
       }
       $httpprotocol = 'https';
+    } else if ($protocol == 1) {
+          $httpprotocol = 'http11';
+    } else {
+          $httpprotocol = 'http';
     }
-    else if ($protocol == 1)
-      $httpprotocol = 'http11';
-    else
-      $httpprotocol = 'http';
 
-    if ($username)
-      $client->setCredentials($username, $password, $authtype);
+    if ($username) {
+          $client->setCredentials($username, $password, $authtype);
+    }
 
     $client->setDebug($debug);
 
@@ -168,8 +169,9 @@ 
         $actionname = 'List of available methods';
         break;
       case 'execute':
-        if (!payload_is_safe($payload))
-          die("Tsk tsk tsk, please stop it or I will have to call in the cops!");
+        if (!payload_is_safe($payload)) {
+                  die("Tsk tsk tsk, please stop it or I will have to call in the cops!");
+        }
         $msg[0] = new $msgclass($method, null, $id);
         // hack! build xml payload by hand
         if ($wstype == 1)
@@ -182,24 +184,22 @@ 
             if ($id == "")
             {
                 $msg[0]->payload .= "null\n}";
-            }
-            else
+            } else
             {
               if (is_numeric($id) || $id == 'false' || $id == 'true' || $id == 'null')
               {
                 $msg[0]->payload .= "$id\n}";
-              }
-              else
+              } else
               {
                 $msg[0]->payload .= "\"$id\"\n}";
               }
             }
-        }
-        else
-          $msg[0]->payload = $msg[0]->xml_header($inputcharset) .
+        } else {
+                  $msg[0]->payload = $msg[0]->xml_header($inputcharset) .
             '<methodName>' . $method . "</methodName>\n<params>" .
             $payload .
             "</params>\n" . $msg[0]->xml_footer();
+        }
         $actionname = 'Execution of method '.$method;
         break;
       default: // give a warning
@@ -213,8 +213,10 @@ 
 
     $response = null;
     // execute method(s)
-    if ($debug)
-      echo '<div class="dbginfo"><h2>Debug info:</h2>';  /// @todo use ob_start instead
+    if ($debug) {
+          echo '<div class="dbginfo"><h2>Debug info:</h2>';
+    }
+    /// @todo use ob_start instead
     $resp = array();
     $mtime = explode(' ',microtime());
     $time = (float)$mtime[0] + (float)$mtime[1];
@@ -223,13 +225,15 @@ 
       // catch errors: for older xmlrpc libs, send does not return by ref
       @$response =& $client->send($message, $timeout, $httpprotocol);
       $resp[] = $response;
-      if (!$response || $response->faultCode())
-        break;
+      if (!$response || $response->faultCode()) {
+              break;
+      }
     }
     $mtime = explode(' ',microtime());
     $time = (float)$mtime[0] + (float)$mtime[1] - $time;
-    if ($debug)
-      echo "</div>\n";
+    if ($debug) {
+          echo "</div>\n";
+    }
 
     if ($response)
     {
@@ -242,8 +246,7 @@ 
       echo "<p>Fault code: [" . htmlspecialchars($response->faultCode(), ENT_COMPAT, $GLOBALS['xmlrpc_internalencoding']) .
         "] Reason: '" . htmlspecialchars($response->faultString(), ENT_COMPAT, $GLOBALS['xmlrpc_internalencoding']) . "'</p>\n";
       echo (strftime("%d/%b/%Y:%H:%M:%S\n"));
-    }
-    else
+    } else
     {
       // call succeeded: parse results
       //echo '<h2>'.htmlspecialchars($actionname, ENT_COMPAT, $inputcharset).' on server '.htmlspecialchars($server, ENT_COMPAT, $inputcharset).'</h2>';
@@ -263,7 +266,11 @@ 
           for($i=0; $i < $max; $i++)
           {
             $rec = $v->arraymem($i);
-            if ($i%2) $class=' class="oddrow"'; else $class = ' class="evenrow"';
+            if ($i%2) {
+                $class=' class="oddrow"';
+            } else {
+                $class = ' class="evenrow"';
+            }
             echo ("<tr><td$class>".htmlspecialchars($rec->scalarval(), ENT_COMPAT, $GLOBALS['xmlrpc_internalencoding'])."</td><td$class><form action=\"controller.php\" method=\"get\" target=\"frmcontroller\">".
               "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />".
               "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />".
@@ -316,18 +323,23 @@ 
         echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n";
         echo "<thead>\n<tr><th>Method</th><th>".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."</th><th>&nbsp;</th><th>&nbsp;</th></tr>\n</thead>\n<tbody>\n";
         $desc = htmlspecialchars($r1->scalarval(), ENT_COMPAT, $GLOBALS['xmlrpc_internalencoding']);
-        if ($desc == "")
-          $desc = "-";
+        if ($desc == "") {
+                  $desc = "-";
+        }
         echo "<tr><td class=\"evenrow\">Description</td><td colspan=\"3\" class=\"evenrow\">$desc</td></tr>\n";
         $payload="";
         $alt_payload="";
-        if ($r2->kindOf()!="array")
-          echo "<tr><td class=\"oddrow\">Signature</td><td class=\"oddrow\">Unknown</td><td class=\"oddrow\">&nbsp;</td></tr>\n";
-        else
+        if ($r2->kindOf()!="array") {
+                  echo "<tr><td class=\"oddrow\">Signature</td><td class=\"oddrow\">Unknown</td><td class=\"oddrow\">&nbsp;</td></tr>\n";
+        } else
         {
           for($i=0; $i < $r2->arraysize(); $i++)
           {
-            if ($i+1%2) $class=' class="oddrow"'; else $class = ' class="evenrow"';
+            if ($i+1%2) {
+                $class=' class="oddrow"';
+            } else {
+                $class = ' class="evenrow"';
+            }
             echo "<tr><td$class>Signature&nbsp;".($i+1)."</td><td$class>";
             $x = $r2->arraymem($i);
             if ($x->kindOf()=="array")
@@ -353,8 +365,7 @@ 
                 }
               }
               echo ")</code>";
-            }
-            else
+            } else
             {
               echo 'Unknown';
             }
@@ -386,8 +397,9 @@ 
             "<input type=\"hidden\" name=\"altmethodpayload\" value=\"".htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset)."\" />".
             "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />".
             "<input type=\"hidden\" name=\"action\" value=\"execute\" />";
-            if ($wstype != 1)
-              echo "<input type=\"submit\" value=\"Load method synopsis\" />";
+            if ($wstype != 1) {
+                          echo "<input type=\"submit\" value=\"Load method synopsis\" />";
+            }
             echo "</form></td>\n";
 
             echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">".
@@ -429,9 +441,9 @@ 
         case 'wrap':
           $r1 = $resp[0]->value();
           $r2 = $resp[1]->value();
-          if ($r2->kindOf()!="array" || $r2->arraysize() <= $methodsig)
-            echo "Error: signature unknown\n";
-          else
+          if ($r2->kindOf()!="array" || $r2->arraysize() <= $methodsig) {
+                      echo "Error: signature unknown\n";
+          } else
           {
           $mdesc = $r1->scalarval();
           $msig = php_xmlrpc_decode($r2);
@@ -441,16 +453,14 @@ 
             $clientcookies == '')
           {
             $opts = 0; // simple client copy in stub code
-          }
-          else
+          } else
           {
             $opts = 1; // complete client copy in stub code
           }
           if ($wstype == 1)
           {
             $prefix = 'jsonrpc';
-          }
-          else
+          } else
           {
             $prefix = 'xmlrpc';
           }
@@ -477,8 +487,7 @@ 
       }
     } // if !$response->faultCode()
     } // if $response
-  }
-  else
+  } else
   {
     // no action taken yet: give some instructions on debugger usage
 ?>

debugger/index.php

Braces +3 added lines, -2 removed lines

@@ -3,8 +3,9 @@
   if (isset($_GET['run']))
   {
     $path = parse_url($_GET['run']);
-    if (isset($path['query']))
-      $query = '?'.$path['query'];
+    if (isset($path['query'])) {
+          $query = '?'.$path['query'];
+    }
   }
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"

debugger/controller.php

Braces +107 added lines, -28 removed lines

@@ -14,8 +14,9 @@ 
  **/
 
   include(dirname(__FILE__).'/common.php');
-  if ($action == '')
-    $action = 'list';
+  if ($action == '') {
+      $action = 'list';
+  }
 
   // relative path to the visual xmlrpc editing dialog
   $editorpath = '../../javascript/debugger/';
@@ -214,7 +215,10 @@ 
 //-->
 </script>
 </head>
-<body onload="switchtransport(<?php echo $wstype;?>); switchaction(); switchssl(); switchauth(); swicthcainfo();<?php if ($run) echo ' document.forms[2].submit();'; ?>">
+<body onload="switchtransport(<?php echo $wstype;?>); switchaction(); switchssl(); switchauth(); swicthcainfo();<?php if ($run) {
+    echo ' document.forms[2].submit();';
+}
+?>">
 <h1>XMLRPC <form name="frmxmlrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(0);"/></form>
 /<form name="frmjsonrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(1);"/></form>JSONRPC Debugger (based on the <a href="http://phpxmlrpc.sourceforge.net">PHP-XMLRPC</a> library)</h1>
 <form name="frmaction" method="get" action="action.php" target="frmaction" onSubmit="switchFormMethod();"
@@ -232,10 +236,22 @@ 
 <table id="actionblock">
 <tr>
 <td><h2>Action</h2></td>
-<td>List available methods<input type="radio" name="action" value="list"<?php if ($action=='list') echo ' checked="checked"'; ?> onclick="switchaction();" /></td>
-<td>Describe method<input type="radio" name="action" value="describe"<?php if ($action=='describe') echo ' checked="checked"'; ?> onclick="switchaction();" /></td>
-<td>Execute method<input type="radio" name="action" value="execute"<?php if ($action=='execute') echo ' checked="checked"'; ?> onclick="switchaction();" /></td>
-<td>Generate stub for method call<input type="radio" name="action" value="wrap"<?php if ($action=='wrap') echo ' checked="checked"'; ?> onclick="switchaction();" /></td>
+<td>List available methods<input type="radio" name="action" value="list"<?php if ($action=='list') {
+    echo ' checked="checked"';
+}
+?> onclick="switchaction();" /></td>
+<td>Describe method<input type="radio" name="action" value="describe"<?php if ($action=='describe') {
+    echo ' checked="checked"';
+}
+?> onclick="switchaction();" /></td>
+<td>Execute method<input type="radio" name="action" value="execute"<?php if ($action=='execute') {
+    echo ' checked="checked"';
+}
+?> onclick="switchaction();" /></td>
+<td>Generate stub for method call<input type="radio" name="action" value="wrap"<?php if ($action=='wrap') {
+    echo ' checked="checked"';
+}
+?> onclick="switchaction();" /></td>
 </tr>
 </table>
 <input type="hidden" name="methodsig" value="<?php echo htmlspecialchars($methodsig, ENT_COMPAT, $inputcharset); ?>" />
@@ -255,16 +271,37 @@ 
 <tr>
 <td><h2>Client options</h2></td>
 <td class="labelcell">Show debug info:</td><td><select name="debug">
-<option value="0"<?php if ($debug == 0) echo ' selected="selected"'; ?>>No</option>
-<option value="1"<?php if ($debug == 1) echo ' selected="selected"'; ?>>Yes</option>
-<option value="2"<?php if ($debug == 2) echo ' selected="selected"'; ?>>More</option>
+<option value="0"<?php if ($debug == 0) {
+    echo ' selected="selected"';
+}
+?>>No</option>
+<option value="1"<?php if ($debug == 1) {
+    echo ' selected="selected"';
+}
+?>>Yes</option>
+<option value="2"<?php if ($debug == 2) {
+    echo ' selected="selected"';
+}
+?>>More</option>
 </select>
 </td>
-<td class="labelcell">Timeout:</td><td><input type="text" name="timeout" size="3" value="<?php if ($timeout > 0) echo $timeout; ?>" /></td>
+<td class="labelcell">Timeout:</td><td><input type="text" name="timeout" size="3" value="<?php if ($timeout > 0) {
+    echo $timeout;
+}
+?>" /></td>
 <td class="labelcell">Protocol:</td><td><select name="protocol" onchange="switchssl(); switchauth(); swicthcainfo();">
-<option value="0"<?php if ($protocol == 0) echo ' selected="selected"'; ?>>HTTP 1.0</option>
-<option value="1"<?php if ($protocol == 1) echo ' selected="selected"'; ?>>HTTP 1.1</option>
-<option value="2"<?php if ($protocol == 2) echo ' selected="selected"'; ?>>HTTPS</option>
+<option value="0"<?php if ($protocol == 0) {
+    echo ' selected="selected"';
+}
+?>>HTTP 1.0</option>
+<option value="1"<?php if ($protocol == 1) {
+    echo ' selected="selected"';
+}
+?>>HTTP 1.1</option>
+<option value="2"<?php if ($protocol == 2) {
+    echo ' selected="selected"';
+}
+?>>HTTPS</option>
 </select></td>
 </tr>
 <tr>
@@ -272,20 +309,41 @@ 
 <td class="labelcell">Username:</td><td><input type="text" name="username" value="<?php echo htmlspecialchars($username, ENT_COMPAT, $inputcharset); ?>" /></td>
 <td class="labelcell">Pwd:</td><td><input type="password" name="password" value="<?php echo htmlspecialchars($password, ENT_COMPAT, $inputcharset); ?>" /></td>
 <td class="labelcell">Type</td><td><select name="authtype">
-<option value="1"<?php if ($authtype == 1) echo ' selected="selected"'; ?>>Basic</option>
-<option value="2"<?php if ($authtype == 2) echo ' selected="selected"'; ?>>Digest</option>
-<option value="8"<?php if ($authtype == 8) echo ' selected="selected"'; ?>>NTLM</option>
+<option value="1"<?php if ($authtype == 1) {
+    echo ' selected="selected"';
+}
+?>>Basic</option>
+<option value="2"<?php if ($authtype == 2) {
+    echo ' selected="selected"';
+}
+?>>Digest</option>
+<option value="8"<?php if ($authtype == 8) {
+    echo ' selected="selected"';
+}
+?>>NTLM</option>
 </select></td>
 <td></td>
 </tr>
 <tr>
 <td class="labelcell">SSL:</td>
 <td class="labelcell">Verify Host's CN:</td><td><select name="verifyhost">
-<option value="0"<?php if ($verifyhost == 0) echo ' selected="selected"'; ?>>No</option>
-<option value="1"<?php if ($verifyhost == 1) echo ' selected="selected"'; ?>>Check CN existance</option>
-<option value="2"<?php if ($verifyhost == 2) echo ' selected="selected"'; ?>>Check CN match</option>
+<option value="0"<?php if ($verifyhost == 0) {
+    echo ' selected="selected"';
+}
+?>>No</option>
+<option value="1"<?php if ($verifyhost == 1) {
+    echo ' selected="selected"';
+}
+?>>Check CN existance</option>
+<option value="2"<?php if ($verifyhost == 2) {
+    echo ' selected="selected"';
+}
+?>>Check CN match</option>
 </select></td>
-<td class="labelcell">Verify Cert:</td><td><input type="checkbox" value="1" name="verifypeer" onclick="swicthcainfo();"<?php if ($verifypeer) echo ' checked="checked"'; ?> /></td>
+<td class="labelcell">Verify Cert:</td><td><input type="checkbox" value="1" name="verifypeer" onclick="swicthcainfo();"<?php if ($verifypeer) {
+    echo ' checked="checked"';
+}
+?> /></td>
 <td class="labelcell">CA Cert file:</td><td><input type="text" name="cainfo" value="<?php echo htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset); ?>" /></td>
 </tr>
 <tr>
@@ -297,15 +355,36 @@ 
 <tr>
 <td class="labelcell">COMPRESSION:</td>
 <td class="labelcell">Request:</td><td><select name="requestcompression">
-<option value="0"<?php if ($requestcompression == 0) echo ' selected="selected"'; ?>>None</option>
-<option value="1"<?php if ($requestcompression == 1) echo ' selected="selected"'; ?>>Gzip</option>
-<option value="2"<?php if ($requestcompression == 2) echo ' selected="selected"'; ?>>Deflate</option>
+<option value="0"<?php if ($requestcompression == 0) {
+    echo ' selected="selected"';
+}
+?>>None</option>
+<option value="1"<?php if ($requestcompression == 1) {
+    echo ' selected="selected"';
+}
+?>>Gzip</option>
+<option value="2"<?php if ($requestcompression == 2) {
+    echo ' selected="selected"';
+}
+?>>Deflate</option>
 </select></td>
 <td class="labelcell">Response:</td><td><select name="responsecompression">
-<option value="0"<?php if ($responsecompression == 0) echo ' selected="selected"'; ?>>None</option>
-<option value="1"<?php if ($responsecompression == 1) echo ' selected="selected"'; ?>>Gzip</option>
-<option value="2"<?php if ($responsecompression == 2) echo ' selected="selected"'; ?>>Deflate</option>
-<option value="3"<?php if ($responsecompression == 3) echo ' selected="selected"'; ?>>Any</option>
+<option value="0"<?php if ($responsecompression == 0) {
+    echo ' selected="selected"';
+}
+?>>None</option>
+<option value="1"<?php if ($responsecompression == 1) {
+    echo ' selected="selected"';
+}
+?>>Gzip</option>
+<option value="2"<?php if ($responsecompression == 2) {
+    echo ' selected="selected"';
+}
+?>>Deflate</option>
+<option value="3"<?php if ($responsecompression == 3) {
+    echo ' selected="selected"';
+}
+?>>Any</option>
 </select></td>
 <td></td>
 </tr>

demo/server/discuss.php

Braces +4 added lines, -8 removed lines

@@ -28,8 +28,7 @@ 
 			if(dba_exists($countID, $dbh))
 			{
 				$count=dba_fetch($countID, $dbh);
-			}
-			else
+			} else
 			{
 				$count=0;
 			}
@@ -48,8 +47,7 @@ 
 		if($err)
 		{
 			return new xmlrpcresp(0, $xmlrpcerruser, $err);
-		}
-		else
+		} else
 		{
 			// otherwise, we create the right response
 			// with the state name
@@ -72,8 +70,7 @@ 
 		if(XMLRPC_EPI_ENABLED == '1')
 		{
 			$msgID=xmlrpc_decode($m->getParam(0));
-		}
-		else
+		} else
 		{
 			$msgID=php_xmlrpc_decode($m->getParam(0));
 		}
@@ -100,8 +97,7 @@ 
 		if($err)
 		{
 			return new xmlrpcresp(0, $xmlrpcerruser, $err);
-		}
-		else
+		} else
 		{
 			// otherwise, we create the right response
 			// with the state name