YetiForceCompany / YetiForceCRM

libraries/nusoap/class.soap_transport_http.php

Doc Comments +1 added lines, -5 removed lines

@@ -169,10 +169,6 @@ 
 	/**
 	* establish an HTTP connection
 	*
-	* @param    integer $timeout set connection timeout in seconds
-	* @param	integer $response_timeout set response timeout in seconds
-	* @return	boolean true if connected, false if not
-	* @access   private
 	*/
 	public function connect($connection_timeout=0,$response_timeout=30){
 	  $this->debug("connect connection_timeout $connection_timeout, response_timeout $response_timeout, scheme $this->scheme, host $this->host, port $this->port");
@@ -717,7 +713,7 @@ 
 	*
 	* @param    string $data message data
 	* @param	array $cookies cookies to send
-	* @return	boolean	true if OK, false if problem
+	* @return	boolean|null	true if OK, false if problem
 	* @access   private
 	*/
 	public function sendRequest($data, $cookies = NULL) {

Spacing +103 added lines, -103 removed lines

@@ -29,18 +29,18 @@ 
 	var $incoming_cookies = array();
 	var $outgoing_payload = '';
 	var $incoming_payload = '';
-	var $response_status_line;	// HTTP response status line
+	var $response_status_line; // HTTP response status line
 	var $useSOAPAction = true;
 	var $persistentConnection = false;
-	var $ch = false;	// cURL handle
-	var $ch_options = array();	// cURL custom options
-	var $use_curl = false;		// force cURL use
-	var $proxy = null;			// proxy information (associative array)
+	var $ch = false; // cURL handle
+	var $ch_options = array(); // cURL custom options
+	var $use_curl = false; // force cURL use
+	var $proxy = null; // proxy information (associative array)
 	var $username = '';
 	var $password = '';
 	var $authtype = '';
 	var $digestRequest = array();
-	var $certRequest = array();	// keys must be cainfofile (optional), sslcertfile, sslkeyfile, passphrase, certpassword (optional), verifypeer (optional), verifyhost (optional)
+	var $certRequest = array(); // keys must be cainfofile (optional), sslcertfile, sslkeyfile, passphrase, certpassword (optional), verifypeer (optional), verifyhost (optional)
 								// cainfofile: certificate authority file, e.g. '$pathToPemFiles/rootca.pem'
 								// sslcertfile: SSL certificate file, e.g. '$pathToPemFiles/mycert.pem'
 								// sslkeyfile: SSL key file, e.g. '$pathToPemFiles/mykey.pem'
@@ -57,7 +57,7 @@ 
 	* @param boolean $use_curl Whether to try to force cURL use
 	* @access public
 	*/
-	public function soap_transport_http($url, $curl_options = NULL, $use_curl = false){
+	public function soap_transport_http($url, $curl_options = NULL, $use_curl = false) {
 		parent::nusoap_base();
 		$this->debug("ctor url=$url use_curl=$use_curl curl_options:");
 		$this->appendDebug($this->varDump($curl_options));
@@ -67,7 +67,7 @@ 
 		}
 		$this->use_curl = $use_curl;
 		preg_match('/\$Revisio' . 'n: ([^ ]+)/', $this->revision, $rev);
-		$this->setHeader('User-Agent', $this->title.'/'.$this->version.' ('.$rev[1].')');
+		$this->setHeader('User-Agent', $this->title . '/' . $this->version . ' (' . $rev[1] . ')');
 	}
 
 	/**
@@ -118,19 +118,19 @@ 
 		$this->url = $url;
 
 		$u = parse_url($url);
-		foreach($u as $k => $v){
+		foreach ($u as $k => $v) {
 			$this->debug("parsed URL $k = $v");
 			$this->$k = $v;
 		}
 		
 		// add any GET params to path
-		if(isset($u['query']) && $u['query'] != ''){
+		if (isset($u['query']) && $u['query'] != '') {
             $this->path .= '?' . $u['query'];
 		}
 		
 		// set default port
-		if(!isset($u['port'])){
-			if($u['scheme'] == 'https'){
+		if (!isset($u['port'])) {
+			if ($u['scheme'] == 'https') {
 				$this->port = 443;
 			} else {
 				$this->port = 80;
@@ -144,7 +144,7 @@ 
 		if (!isset($u['port'])) {
 			$this->setHeader('Host', $this->host);
 		} else {
-			$this->setHeader('Host', $this->host.':'.$this->port);
+			$this->setHeader('Host', $this->host . ':' . $this->port);
 		}
 
 		if (isset($u['user']) && $u['user'] != '') {
@@ -174,7 +174,7 @@ 
 	* @return	boolean true if connected, false if not
 	* @access   private
 	*/
-	public function connect($connection_timeout=0,$response_timeout=30){
+	public function connect($connection_timeout = 0, $response_timeout = 30) {
 	  $this->debug("connect connection_timeout $connection_timeout, response_timeout $response_timeout, scheme $this->scheme, host $this->host, port $this->port");
 	  if ($this->io_method() == 'socket') {
 		if (!is_array($this->proxy)) {
@@ -186,7 +186,7 @@ 
 		}
 
 		// use persistent connection
-		if($this->persistentConnection && isset($this->fp) && is_resource($this->fp)){
+		if ($this->persistentConnection && isset($this->fp) && is_resource($this->fp)) {
 			if (!feof($this->fp)) {
 				$this->debug('Re-use persistent connection');
 				return true;
@@ -202,17 +202,17 @@ 
 		$this->debug('calling fsockopen with host ' . $host . ' connection_timeout ' . $connection_timeout);
 
 		// open socket
-		if($connection_timeout > 0){
-			$this->fp = @fsockopen( $host, $this->port, $this->errno, $this->error_str, $connection_timeout);
+		if ($connection_timeout > 0) {
+			$this->fp = @fsockopen($host, $this->port, $this->errno, $this->error_str, $connection_timeout);
 		} else {
-			$this->fp = @fsockopen( $host, $this->port, $this->errno, $this->error_str);
+			$this->fp = @fsockopen($host, $this->port, $this->errno, $this->error_str);
 		}
 		
 		// test pointer
-		if(!$this->fp) {
+		if (!$this->fp) {
 			$msg = 'Couldn\'t open socket connection to server ' . $this->url;
 			if ($this->errno) {
-				$msg .= ', Error ('.$this->errno.'): '.$this->error_str;
+				$msg .= ', Error (' . $this->errno . '): ' . $this->error_str;
 			} else {
 				$msg .= ' prior to connect().  This is often a problem looking up the host name.';
 			}
@@ -223,7 +223,7 @@ 
 		
 		// set response timeout
 		$this->debug('set response timeout to ' . $response_timeout);
-		socket_set_timeout( $this->fp, $response_timeout);
+		socket_set_timeout($this->fp, $response_timeout);
 
 		$this->debug('socket connected');
 		return true;
@@ -362,13 +362,13 @@ 
 		if (is_array($this->proxy)) {
 			$this->debug('set cURL proxy options');
 			if ($this->proxy['port'] != '') {
-				$this->setCurlOption(CURLOPT_PROXY, $this->proxy['host'].':'.$this->proxy['port']);
+				$this->setCurlOption(CURLOPT_PROXY, $this->proxy['host'] . ':' . $this->proxy['port']);
 			} else {
 				$this->setCurlOption(CURLOPT_PROXY, $this->proxy['host']);
 			}
 			if ($this->proxy['username'] || $this->proxy['password']) {
 				$this->debug('set cURL proxy authentication options');
-				$this->setCurlOption(CURLOPT_PROXYUSERPWD, $this->proxy['username'].':'.$this->proxy['password']);
+				$this->setCurlOption(CURLOPT_PROXYUSERPWD, $this->proxy['username'] . ':' . $this->proxy['password']);
 				if ($this->proxy['authtype'] == 'basic') {
 					$this->setCurlOption($CURLOPT_PROXYAUTH, $CURLAUTH_BASIC);
 				}
@@ -396,9 +396,9 @@ 
 	* @return	string data
 	* @access   public
 	*/
-	public function send($data, $timeout=0, $response_timeout=30, $cookies=NULL) {
+	public function send($data, $timeout = 0, $response_timeout = 30, $cookies = NULL) {
 		
-		$this->debug('entered send() with data of length: '.strlen($data));
+		$this->debug('entered send() with data of length: ' . strlen($data));
 
 		$this->tryagain = true;
 		$tries = 0;
@@ -406,12 +406,12 @@ 
 			$this->tryagain = false;
 			if ($tries++ < 2) {
 				// make connnection
-				if (!$this->connect($timeout, $response_timeout)){
+				if (!$this->connect($timeout, $response_timeout)) {
 					return false;
 				}
 				
 				// send request
-				if (!$this->sendRequest($data, $cookies)){
+				if (!$this->sendRequest($data, $cookies)) {
 					return false;
 				}
 				
@@ -437,7 +437,7 @@ 
 	* @access   public
 	* @deprecated
 	*/
-	public function sendHTTPS($data, $timeout=0, $response_timeout=30, $cookies) {
+	public function sendHTTPS($data, $timeout = 0, $response_timeout = 30, $cookies) {
 		return $this->send($data, $timeout, $response_timeout, $cookies);
 	}
 	
@@ -458,7 +458,7 @@ 
 		$this->appendDebug($this->varDump($certRequest));
 		// cf. RFC 2617
 		if ($authtype == 'basic') {
-			$this->setHeader('Authorization', 'Basic '.base64_encode(str_replace(':','',$username).':'.$password));
+			$this->setHeader('Authorization', 'Basic ' . base64_encode(str_replace(':', '', $username) . ':' . $password));
 		} elseif ($authtype == 'digest') {
 			if (isset($digestRequest['nonce'])) {
 				$digestRequest['nc'] = isset($digestRequest['nc']) ? $digestRequest['nc']++ : 1;
@@ -466,7 +466,7 @@ 
 				// calculate the Digest hashes (calculate code based on digest implementation found at: http://www.rassoc.com/gregr/weblog/stories/2002/07/09/webServicesSecurityHttpDigestAuthenticationWithoutActiveDirectory.html)
 	
 				// A1 = unq(username-value) ":" unq(realm-value) ":" passwd
-				$A1 = $username. ':' . (isset($digestRequest['realm']) ? $digestRequest['realm'] : '') . ':' . $password;
+				$A1 = $username . ':' . (isset($digestRequest['realm']) ? $digestRequest['realm'] : '') . ':' . $password;
 	
 				// H(A1) = MD5(A1)
 				$HA1 = md5($A1);
@@ -475,7 +475,7 @@ 
 				$A2 = $this->request_method . ':' . $this->digest_uri;
 	
 				// H(A2)
-				$HA2 =  md5($A2);
+				$HA2 = md5($A2);
 	
 				// KD(secret, data) = H(concat(secret, ":", data))
 				// if qop == auth:
@@ -535,7 +535,7 @@ 
 	* @param    string $enc encoding style. supported values: gzip, deflate, or both
 	* @access   public
 	*/
-	public function setEncoding($enc='gzip, deflate') {
+	public function setEncoding($enc = 'gzip, deflate') {
 		if (function_exists('gzdeflate')) {
 			$this->protocol_version = '1.1';
 			$this->setHeader('Accept-Encoding', $enc);
@@ -569,7 +569,7 @@ 
 				'authtype' => $proxyauthtype
 			);
 			if ($proxyusername != '' && $proxypassword != '' && $proxyauthtype = 'basic') {
-				$this->setHeader('Proxy-Authorization', ' Basic '.base64_encode($proxyusername.':'.$proxypassword));
+				$this->setHeader('Proxy-Authorization', ' Basic ' . base64_encode($proxyusername . ':' . $proxypassword));
 			}
 		} else {
 			$this->debug('remove proxy');
@@ -588,7 +588,7 @@ 
 	 * @access	private
 	 */
 	public function isSkippableCurlHeader(&$data) {
-		$skipHeaders = array(	'HTTP/1.1 100',
+		$skipHeaders = array('HTTP/1.1 100',
 								'HTTP/1.0 301',
 								'HTTP/1.1 301',
 								'HTTP/1.0 302',
@@ -614,7 +614,7 @@ 
 	* @access   public
 	* @deprecated
 	*/
-	public function decodeChunked($buffer, $lb){
+	public function decodeChunked($buffer, $lb) {
 		// length := 0
 		$length = 0;
 		$new = '';
@@ -626,17 +626,17 @@ 
 			$this->debug('no linebreak found in decodeChunked');
 			return $new;
 		}
-		$temp = substr($buffer,0,$chunkend);
-		$chunk_size = hexdec( trim($temp) );
+		$temp = substr($buffer, 0, $chunkend);
+		$chunk_size = hexdec(trim($temp));
 		$chunkstart = $chunkend + strlen($lb);
 		// while (chunk-size > 0) {
 		while ($chunk_size > 0) {
 			$this->debug("chunkstart: $chunkstart chunk_size: $chunk_size");
-			$chunkend = strpos( $buffer, $lb, $chunkstart + $chunk_size);
+			$chunkend = strpos($buffer, $lb, $chunkstart + $chunk_size);
 		  	
 			// Just in case we got a broken connection
 		  	if ($chunkend == FALSE) {
-		  	    $chunk = substr($buffer,$chunkstart);
+		  	    $chunk = substr($buffer, $chunkstart);
 				// append chunk-data to entity-body
 		    	$new .= $chunk;
 		  	    $length += strlen($chunk);
@@ -644,7 +644,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
@@ -656,8 +656,8 @@ 
 			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;
@@ -692,15 +692,15 @@ 
 		$this->outgoing_payload = "$req\r\n";
 
 		// loop thru headers, serializing
-		foreach($this->outgoing_headers as $k => $v){
-			$hdr = $k.': '.$v;
+		foreach ($this->outgoing_headers as $k => $v) {
+			$hdr = $k . ': ' . $v;
 			$this->debug("HTTP header: $hdr");
 			$this->outgoing_payload .= "$hdr\r\n";
 		}
 
 		// add any cookies
 		if ($cookie_str != '') {
-			$hdr = 'Cookie: '.$cookie_str;
+			$hdr = 'Cookie: ' . $cookie_str;
 			$this->debug("HTTP header: $hdr");
 			$this->outgoing_payload .= "$hdr\r\n";
 		}
@@ -729,7 +729,7 @@ 
 
 	  if ($this->io_method() == 'socket') {
 		// send payload
-		if(!fputs($this->fp, $this->outgoing_payload, strlen($this->outgoing_payload))) {
+		if (!fputs($this->fp, $this->outgoing_payload, strlen($this->outgoing_payload))) {
 			$this->setError('couldn\'t write message data to socket');
 			$this->debug('couldn\'t write message data to socket');
 			return false;
@@ -742,7 +742,7 @@ 
 		// turns out that the URI and HTTP version are appended to this, which
 		// some servers refuse to work with (so we no longer use this method!)
 		$curl_headers = array();
-		foreach($this->outgoing_headers as $k => $v){
+		foreach ($this->outgoing_headers as $k => $v) {
 			if ($k == 'Connection' || $k == 'Content-Length' || $k == 'Host' || $k == 'Authorization' || $k == 'Proxy-Authorization') {
 				$this->debug("Skip cURL header $k: $v");
 			} else {
@@ -776,16 +776,16 @@ 
 	* @return	string the response (also sets member variables like incoming_payload)
 	* @access   private
 	*/
-	public function getResponse(){
+	public function getResponse() {
 		$this->incoming_payload = '';
 	    
 	  if ($this->io_method() == 'socket') {
 	    // loop until headers have been retrieved
 	    $data = '';
-	    while (!isset($lb)){
+	    while (!isset($lb)) {
 
 			// We might EOF during header read.
-			if(feof($this->fp)) {
+			if (feof($this->fp)) {
 				$this->incoming_payload = $data;
 				$this->debug('found no headers before EOF after length ' . strlen($data));
 				$this->debug("received before EOF:\n" . $data);
@@ -806,17 +806,17 @@ 
 			}
 
 			$data .= $tmp;
-			$pos = strpos($data,"\r\n\r\n");
-			if($pos > 1){
+			$pos = strpos($data, "\r\n\r\n");
+			if ($pos > 1) {
 				$lb = "\r\n";
 			} else {
-				$pos = strpos($data,"\n\n");
-				if($pos > 1){
+				$pos = strpos($data, "\n\n");
+				if ($pos > 1) {
 					$lb = "\n";
 				}
 			}
 			// remove 100 headers
-			if (isset($lb) && preg_match('/^HTTP\/1.1 100/',$data)) {
+			if (isset($lb) && preg_match('/^HTTP\/1.1 100/', $data)) {
 				unset($lb);
 				$data = '';
 			}//
@@ -825,13 +825,13 @@ 
 		$this->incoming_payload .= $data;
 		$this->debug('found end of headers after length ' . strlen($data));
 		// process headers
-		$header_data = trim(substr($data,0,$pos));
-		$header_array = explode($lb,$header_data);
+		$header_data = trim(substr($data, 0, $pos));
+		$header_array = explode($lb, $header_data);
 		$this->incoming_headers = array();
 		$this->incoming_cookies = array();
-		foreach($header_array as $header_line){
-			$arr = explode(':',$header_line, 2);
-			if(count($arr) > 1){
+		foreach ($header_array as $header_line) {
+			$arr = explode(':', $header_line, 2);
+			if (count($arr) > 1) {
 				$header_name = strtolower(trim($arr[0]));
 				$this->incoming_headers[$header_name] = trim($arr[1]);
 				if ($header_name == 'set-cookie') {
@@ -851,7 +851,7 @@ 
 		
 		// loop until msg has been received
 		if (isset($this->incoming_headers['transfer-encoding']) && strtolower($this->incoming_headers['transfer-encoding']) == 'chunked') {
-			$content_length =  2147483647;	// ignore any content-length header
+			$content_length = 2147483647; // ignore any content-length header
 			$chunked = true;
 			$this->debug("want to read chunked content");
 		} elseif (isset($this->incoming_headers['content-length'])) {
@@ -859,7 +859,7 @@ 
 			$chunked = false;
 			$this->debug("want to read content of length $content_length");
 		} else {
-			$content_length =  2147483647;
+			$content_length = 2147483647;
 			$chunked = false;
 			$this->debug("want to read content to EOF");
 		}
@@ -913,19 +913,19 @@ 
 		}
 		$this->debug('read body of length ' . strlen($data));
 		$this->incoming_payload .= $data;
-		$this->debug('received a total of '.strlen($this->incoming_payload).' bytes of data from server');
+		$this->debug('received a total of ' . strlen($this->incoming_payload) . ' bytes of data from server');
 		
 		// close filepointer
-		if(
+		if (
 			(isset($this->incoming_headers['connection']) && strtolower($this->incoming_headers['connection']) == 'close') || 
-			(! $this->persistentConnection) || feof($this->fp)){
+			(!$this->persistentConnection) || feof($this->fp)) {
 			fclose($this->fp);
 			$this->fp = false;
 			$this->debug('closed socket');
 		}
 		
 		// connection was closed unexpectedly
-		if($this->incoming_payload == ''){
+		if ($this->incoming_payload == '') {
 			$this->setError('no response from server');
 			return false;
 		}
@@ -949,8 +949,8 @@ 
 
         $cErr = curl_error($this->ch);
 		if ($cErr != '') {
-        	$err = 'cURL ERROR: '.curl_errno($this->ch).': '.$cErr.'<br>';
-			foreach(curl_getinfo($this->ch) as $k => $v){
+        	$err = 'cURL ERROR: ' . curl_errno($this->ch) . ': ' . $cErr . '<br>';
+			foreach (curl_getinfo($this->ch) as $k => $v) {
 				$err .= "$k: $v<br>";
 			}
 			$this->debug($err);
@@ -970,44 +970,44 @@ 
 		$savedata = $data;
 		while ($this->isSkippableCurlHeader($data)) {
 			$this->debug("Found HTTP header to skip");
-			if ($pos = strpos($data,"\r\n\r\n")) {
-				$data = ltrim(substr($data,$pos));
-			} elseif($pos = strpos($data,"\n\n") ) {
-				$data = ltrim(substr($data,$pos));
+			if ($pos = strpos($data, "\r\n\r\n")) {
+				$data = ltrim(substr($data, $pos));
+			} elseif ($pos = strpos($data, "\n\n")) {
+				$data = ltrim(substr($data, $pos));
 			}
 		}
 
 		if ($data == '') {
 			// have nothing left; just remove 100 header(s)
 			$data = $savedata;
-			while (preg_match('/^HTTP\/1.1 100/',$data)) {
-				if ($pos = strpos($data,"\r\n\r\n")) {
-					$data = ltrim(substr($data,$pos));
-				} elseif($pos = strpos($data,"\n\n") ) {
-					$data = ltrim(substr($data,$pos));
+			while (preg_match('/^HTTP\/1.1 100/', $data)) {
+				if ($pos = strpos($data, "\r\n\r\n")) {
+					$data = ltrim(substr($data, $pos));
+				} elseif ($pos = strpos($data, "\n\n")) {
+					$data = ltrim(substr($data, $pos));
 				}
 			}
 		}
 		
 		// separate content from HTTP headers
-		if ($pos = strpos($data,"\r\n\r\n")) {
+		if ($pos = strpos($data, "\r\n\r\n")) {
 			$lb = "\r\n";
-		} elseif( $pos = strpos($data,"\n\n")) {
+		} elseif ($pos = strpos($data, "\n\n")) {
 			$lb = "\n";
 		} else {
 			$this->debug('no proper separation of headers and document');
 			$this->setError('no proper separation of headers and document');
 			return false;
 		}
-		$header_data = trim(substr($data,0,$pos));
-		$header_array = explode($lb,$header_data);
-		$data = ltrim(substr($data,$pos));
+		$header_data = trim(substr($data, 0, $pos));
+		$header_array = explode($lb, $header_data);
+		$data = ltrim(substr($data, $pos));
 		$this->debug('found proper separation of headers and document');
-		$this->debug('cleaned data, stringlen: '.strlen($data));
+		$this->debug('cleaned data, stringlen: ' . strlen($data));
 		// clean headers
 		foreach ($header_array as $header_line) {
-			$arr = explode(':',$header_line,2);
-			if(count($arr) > 1){
+			$arr = explode(':', $header_line, 2);
+			if (count($arr) > 1) {
 				$header_name = strtolower(trim($arr[0]));
 				$this->incoming_headers[$header_name] = trim($arr[1]);
 				if ($header_name == 'set-cookie') {
@@ -1077,10 +1077,10 @@ 
 		}
 
 		// decode content-encoding
-		if(isset($this->incoming_headers['content-encoding']) && $this->incoming_headers['content-encoding'] != ''){
-			if(strtolower($this->incoming_headers['content-encoding']) == 'deflate' || strtolower($this->incoming_headers['content-encoding']) == 'gzip'){
+		if (isset($this->incoming_headers['content-encoding']) && $this->incoming_headers['content-encoding'] != '') {
+			if (strtolower($this->incoming_headers['content-encoding']) == 'deflate' || strtolower($this->incoming_headers['content-encoding']) == 'gzip') {
     			// if decoding works, use it. else assume data wasn't gzencoded
-    			if(function_exists('gzinflate')){
+    			if (function_exists('gzinflate')) {
 					// IIS 5 requires gzinflate instead of gzuncompress (similar to IE 5 and gzdeflate v. gzcompress)
 					// this means there are no Zlib headers, although there should be
 					$this->debug('The gzinflate function exists');
@@ -1120,7 +1120,7 @@ 
 					}
 					//print "<xmp>\nde-inflated:\n---------------\n$data\n-------------\n</xmp>";
 					// set decoded payload
-					$this->incoming_payload = $header_data.$lb.$lb.$data;
+					$this->incoming_payload = $header_data . $lb . $lb . $data;
     			} else {
 					$this->debug('The server sent compressed data. Your php install must have the Zlib extension compiled in to support this.');
 					$this->setError('The server sent compressed data. Your php install must have the Zlib extension compiled in to support this.');
@@ -1133,7 +1133,7 @@ 
 			$this->debug('No Content-Encoding header');
 		}
 		
-		if(strlen($data) == 0){
+		if (strlen($data) == 0) {
 			$this->debug('no data after headers!');
 			$this->setError('no data present after HTTP headers');
 			return false;
@@ -1159,7 +1159,7 @@ 
 	 * @return	boolean whether the request was honored by this method.
 	 * @access	public
 	 */
-	public function usePersistentConnection(){
+	public function usePersistentConnection() {
 		if (isset($this->outgoing_headers['Accept-Encoding'])) {
 			return false;
 		}
@@ -1202,7 +1202,7 @@ 
 
 		$cookie_param = 'path=';
 		$start = strpos($cookie_str, $cookie_param);
-		if ( $start > 0 ) {
+		if ($start > 0) {
 			$path = substr($cookie_str, $start + strlen($cookie_param));
 			$path = substr($path, 0, strpos($path, ';'));
 		} else {
@@ -1221,7 +1221,7 @@ 
 		if ($sep_pos) {
 			$name = substr($value_str, 0, $sep_pos);
 			$value = substr($value_str, $sep_pos + 1);
-			$cookie= array(	'name' => $name,
+			$cookie = array('name' => $name,
 			                'value' => $value,
 							'domain' => $domain,
 							'path' => $path,
@@ -1241,35 +1241,35 @@ 
 	 * @return	string for Cookie-HTTP-Header
 	 * @access	private
 	 */
-	public function getCookiesForRequest($cookies, $secure=false) {
+	public function getCookiesForRequest($cookies, $secure = false) {
 		$cookie_str = '';
-		if ((! is_null($cookies)) && (is_array($cookies))) {
+		if ((!is_null($cookies)) && (is_array($cookies))) {
 			foreach ($cookies as $cookie) {
-				if (! is_array($cookie)) {
+				if (!is_array($cookie)) {
 					continue;
 				}
-	    		$this->debug("check cookie for validity: ".$cookie['name'].'='.$cookie['value']);
-				if ((isset($cookie['expires'])) && (! empty($cookie['expires']))) {
+	    		$this->debug("check cookie for validity: " . $cookie['name'] . '=' . $cookie['value']);
+				if ((isset($cookie['expires'])) && (!empty($cookie['expires']))) {
 					if (strtotime($cookie['expires']) <= time()) {
 						$this->debug('cookie has expired');
 						continue;
 					}
 				}
-				if ((isset($cookie['domain'])) && (! empty($cookie['domain']))) {
+				if ((isset($cookie['domain'])) && (!empty($cookie['domain']))) {
 					$domain = preg_quote($cookie['domain']);
-					if (! preg_match("'.*$domain$'i", $this->host)) {
+					if (!preg_match("'.*$domain$'i", $this->host)) {
 						$this->debug('cookie has different domain');
 						continue;
 					}
 				}
-				if ((isset($cookie['path'])) && (! empty($cookie['path']))) {
+				if ((isset($cookie['path'])) && (!empty($cookie['path']))) {
 					$path = preg_quote($cookie['path']);
-					if (! preg_match("'^$path.*'i", $this->path)) {
+					if (!preg_match("'^$path.*'i", $this->path)) {
 						$this->debug('cookie is for a different path');
 						continue;
 					}
 				}
-				if ((! $secure) && (isset($cookie['secure'])) && ($cookie['secure'])) {
+				if ((!$secure) && (isset($cookie['secure'])) && ($cookie['secure'])) {
 					$this->debug('cookie is secure, transport is not');
 					continue;
 				}

vtlib/Vtiger/PackageExport.php

Doc Comments +12 added lines, -1 removed lines

@@ -205,7 +205,7 @@ 
 
 	/**
 	 * Function copies language files to zip
-	 * @param <vtlib\Zip> $zip
+	 * @param Zip $zip
 	 * @param <String> $module
 	 */
 	public function __copyLanguageFiles($zip, $module)
@@ -240,6 +240,7 @@ 
 	/**
 	 * Export vtiger dependencies
 	 * @access private
+	 * @param boolean $moduleInstance
 	 */
 	public function export_Dependencies($moduleInstance)
 	{
@@ -376,6 +377,7 @@ 
 	/**
 	 * Export module blocks with its related fields
 	 * @access private
+	 * @param boolean $moduleInstance
 	 */
 	public function export_Blocks($moduleInstance)
 	{
@@ -539,6 +541,7 @@ 
 	/**
 	 * Export Custom views of the module
 	 * @access private
+	 * @param boolean $moduleInstance
 	 */
 	public function export_CustomViews($moduleInstance)
 	{
@@ -598,6 +601,7 @@ 
 	/**
 	 * Export Sharing Access of the module
 	 * @access private
+	 * @param boolean $moduleInstance
 	 */
 	public function export_SharingAccess($moduleInstance)
 	{
@@ -632,6 +636,7 @@ 
 	/**
 	 * Export Events of the module
 	 * @access private
+	 * @param boolean $moduleInstance
 	 */
 	public function export_Events($moduleInstance)
 	{
@@ -651,6 +656,9 @@ 
 		$this->closeNode('events');
 	}
 
+	/**
+	 * @param boolean $moduleInstance
+	 */
 	public function export_Actions($moduleInstance)
 	{
 
@@ -676,6 +684,7 @@ 
 	/**
 	 * Export related lists associated with module.
 	 * @access private
+	 * @param boolean $moduleInstance
 	 */
 	public function export_RelatedLists($moduleInstance)
 	{
@@ -748,6 +757,7 @@ 
 	/**
 	 * Export custom links of the module.
 	 * @access private
+	 * @param boolean $moduleInstance
 	 */
 	public function export_CustomLinks($moduleInstance)
 	{
@@ -773,6 +783,7 @@ 
 	/**
 	 * Export cron tasks for the module.
 	 * @access private
+	 * @param boolean $moduleInstance
 	 */
 	public function export_CronTasks($moduleInstance)
 	{

libraries/nusoap/class.soap_parser.php

Spacing +84 added lines, -84 removed lines

@@ -21,7 +21,7 @@ 
 	var $root_struct_name = '';
 	var $root_struct_namespace = '';
 	var $root_header = '';
-    var $document = '';			// incoming SOAP body (text)
+    var $document = ''; // incoming SOAP body (text)
 	// determines where in the message we are (envelope,header,body,method)
 	var $status = '';
 	var $position = 0;
@@ -36,9 +36,9 @@ 
 	var $fault_detail = '';
 	var $depth_array = array();
 	var $debug_flag = true;
-	var $soapresponse = NULL;	// parsed SOAP Body
-	var $soapheader = NULL;		// parsed SOAP Header
-	var $responseHeaders = '';	// incoming SOAP headers (text)
+	var $soapresponse = NULL; // parsed SOAP Body
+	var $soapheader = NULL; // parsed SOAP Header
+	var $responseHeaders = ''; // incoming SOAP headers (text)
 	var $body_position = 0;
 	// for multiref parsing:
 	// array of id => pos
@@ -57,7 +57,7 @@ 
 	* @param    string $decode_utf8 whether to decode UTF-8 to ISO-8859-1
 	* @access   public
 	*/
-	public function nusoap_parser($xml,$encoding='UTF-8',$method='',$decode_utf8=true){
+	public function nusoap_parser($xml, $encoding = 'UTF-8', $method = '', $decode_utf8 = true) {
 		parent::nusoap_base();
 		$this->xml = $xml;
 		$this->xml_encoding = $encoding;
@@ -65,7 +65,7 @@ 
 		$this->decode_utf8 = $decode_utf8;
 
 		// Check whether content has been read.
-		if(!empty($xml)){
+		if (!empty($xml)) {
 			// Check XML encoding
 			$pos_xml = strpos($xml, '<?xml');
 			if ($pos_xml !== FALSE) {
@@ -89,7 +89,7 @@ 
 			} else {
 				$this->debug('No XML declaration');
 			}
-			$this->debug('Entering nusoap_parser(), length='.strlen($xml).', encoding='.$encoding);
+			$this->debug('Entering nusoap_parser(), length=' . strlen($xml) . ', encoding=' . $encoding);
 			// Create an XML parser - why not xml_parser_create_ns?
 			$this->parser = xml_parser_create($this->xml_encoding);
 			// Set the options for parsing the XML data.
@@ -99,11 +99,11 @@ 
 			// Set the object for the parser.
 			xml_set_object($this->parser, $this);
 			// Set the element handlers for the parser.
-			xml_set_element_handler($this->parser, 'start_element','end_element');
-			xml_set_character_data_handler($this->parser,'character_data');
+			xml_set_element_handler($this->parser, 'start_element', 'end_element');
+			xml_set_character_data_handler($this->parser, 'character_data');
 
 			// Parse the XML file.
-			if(!xml_parse($this->parser,$xml,true)){
+			if (!xml_parse($this->parser, $xml, true)) {
 			    // Display an error message.
 			    $err = sprintf('XML error parsing SOAP payload on line %d: %s',
 			    xml_get_current_line_number($this->parser),
@@ -114,23 +114,23 @@ 
 			} else {
 				$this->debug('in nusoap_parser ctor, message:');
 				$this->appendDebug($this->varDump($this->message));
-				$this->debug('parsed successfully, found root struct: '.$this->root_struct.' of name '.$this->root_struct_name);
+				$this->debug('parsed successfully, found root struct: ' . $this->root_struct . ' of name ' . $this->root_struct_name);
 				// get final value
 				$this->soapresponse = $this->message[$this->root_struct]['result'];
 				// get header value
-				if($this->root_header != '' && isset($this->message[$this->root_header]['result'])){
+				if ($this->root_header != '' && isset($this->message[$this->root_header]['result'])) {
 					$this->soapheader = $this->message[$this->root_header]['result'];
 				}
 				// resolve hrefs/ids
-				if(sizeof($this->multirefs) > 0){
-					foreach($this->multirefs as $id => $hrefs){
-						$this->debug('resolving multirefs for id: '.$id);
+				if (sizeof($this->multirefs) > 0) {
+					foreach ($this->multirefs as $id => $hrefs) {
+						$this->debug('resolving multirefs for id: ' . $id);
 						$idVal = $this->buildVal($this->ids[$id]);
 						if (is_array($idVal) && isset($idVal['!id'])) {
 							unset($idVal['!id']);
 						}
-						foreach($hrefs as $refPos => $ref){
-							$this->debug('resolving href at pos '.$refPos);
+						foreach ($hrefs as $refPos => $ref) {
+							$this->debug('resolving href at pos ' . $refPos);
 							$this->multirefs[$id][$refPos] = $idVal;
 						}
 					}
@@ -156,14 +156,14 @@ 
 		// update class level pos
 		$pos = $this->position++;
 		// and set mine
-		$this->message[$pos] = array('pos' => $pos,'children'=>'','cdata'=>'');
+		$this->message[$pos] = array('pos' => $pos, 'children'=>'', 'cdata'=>'');
 		// depth = how many levels removed from root?
 		// set mine as current global depth and increment global depth value
 		$this->message[$pos]['depth'] = $this->depth++;
 
 		// else add self as child to whoever the current parent is
-		if($pos != 0){
-			$this->message[$this->parent]['children'] .= '|'.$pos;
+		if ($pos != 0) {
+			$this->message[$this->parent]['children'] .= '|' . $pos;
 		}
 		// set my parent
 		$this->message[$pos]['parent'] = $this->parent;
@@ -172,11 +172,11 @@ 
 		// set self as current value for this depth
 		$this->depth_array[$this->depth] = $pos;
 		// get element prefix
-		if(strpos($name,':')){
+		if (strpos($name, ':')) {
 			// get ns prefix
-			$prefix = substr($name,0,strpos($name,':'));
+			$prefix = substr($name, 0, strpos($name, ':'));
 			// get unqualified name
-			$name = substr(strstr($name,':'),1);
+			$name = substr(strstr($name, ':'), 1);
 		}
 		// set status
 		if ($name == 'Envelope' && $this->status == '') {
@@ -184,11 +184,11 @@ 
 		} elseif ($name == 'Header' && $this->status == 'envelope') {
 			$this->root_header = $pos;
 			$this->status = 'header';
-		} elseif ($name == 'Body' && $this->status == 'envelope'){
+		} elseif ($name == 'Body' && $this->status == 'envelope') {
 			$this->status = 'body';
 			$this->body_position = $pos;
 		// set method
-		} elseif($this->status == 'body' && $pos == ($this->body_position+1)) {
+		} elseif ($this->status == 'body' && $pos == ($this->body_position + 1)) {
 			$this->status = 'method';
 			$this->root_struct_name = $name;
 			$this->root_struct = $pos;
@@ -204,23 +204,23 @@ 
 
 		// loop through atts, logging ns and type declarations
         $attstr = '';
-		foreach($attrs as $key => $value){
+		foreach ($attrs as $key => $value) {
         	$key_prefix = $this->getPrefix($key);
 			$key_localpart = $this->getLocalPart($key);
 			// if ns declarations, add to class level array of valid namespaces
-            if($key_prefix == 'xmlns'){
-				if(preg_match('/^http:\/\/www.w3.org\/[0-9]{4}\/XMLSchema$/',$value)){
+            if ($key_prefix == 'xmlns') {
+				if (preg_match('/^http:\/\/www.w3.org\/[0-9]{4}\/XMLSchema$/', $value)) {
 					$this->XMLSchemaVersion = $value;
 					$this->namespaces['xsd'] = $this->XMLSchemaVersion;
-					$this->namespaces['xsi'] = $this->XMLSchemaVersion.'-instance';
+					$this->namespaces['xsi'] = $this->XMLSchemaVersion . '-instance';
 				}
                 $this->namespaces[$key_localpart] = $value;
 				// set method namespace
-				if($name == $this->root_struct_name){
+				if ($name == $this->root_struct_name) {
 					$this->methodNamespace = $value;
 				}
 			// if it's a type declaration, set type
-        } elseif($key_localpart == 'type'){
+        } elseif ($key_localpart == 'type') {
         		if (isset($this->message[$pos]['type']) && $this->message[$pos]['type'] == 'array') {
         			// do nothing: already processed arrayType
         		} else {
@@ -228,14 +228,14 @@ 
 	                $value_localpart = $this->getLocalPart($value);
 					$this->message[$pos]['type'] = $value_localpart;
 					$this->message[$pos]['typePrefix'] = $value_prefix;
-	                if(isset($this->namespaces[$value_prefix])){
+	                if (isset($this->namespaces[$value_prefix])) {
 	                	$this->message[$pos]['type_namespace'] = $this->namespaces[$value_prefix];
-	                } else if(isset($attrs['xmlns:'.$value_prefix])) {
-						$this->message[$pos]['type_namespace'] = $attrs['xmlns:'.$value_prefix];
+	                } else if (isset($attrs['xmlns:' . $value_prefix])) {
+						$this->message[$pos]['type_namespace'] = $attrs['xmlns:' . $value_prefix];
 	                }
 					// should do something here with the namespace of specified type?
 				}
-			} elseif($key_localpart == 'arrayType'){
+			} elseif ($key_localpart == 'arrayType') {
 				$this->message[$pos]['type'] = 'array';
 				/* do arrayType ereg here
 				[1]    arrayTypeValue    ::=    atype asize
@@ -246,20 +246,20 @@ 
 				[6]    nextDimension    ::=    Digit+ ','
 				*/
 				$expr = '/([A-Za-z0-9_]+):([A-Za-z]+[A-Za-z0-9_]+)\[([0-9]+),?([0-9]*)\]/';
-				if(preg_match($expr,$value,$regs)){
+				if (preg_match($expr, $value, $regs)) {
 					$this->message[$pos]['typePrefix'] = $regs[1];
 					$this->message[$pos]['arrayTypePrefix'] = $regs[1];
 	                if (isset($this->namespaces[$regs[1]])) {
 	                	$this->message[$pos]['arrayTypeNamespace'] = $this->namespaces[$regs[1]];
-	                } else if (isset($attrs['xmlns:'.$regs[1]])) {
-						$this->message[$pos]['arrayTypeNamespace'] = $attrs['xmlns:'.$regs[1]];
+	                } else if (isset($attrs['xmlns:' . $regs[1]])) {
+						$this->message[$pos]['arrayTypeNamespace'] = $attrs['xmlns:' . $regs[1]];
 	                }
 					$this->message[$pos]['arrayType'] = $regs[2];
 					$this->message[$pos]['arraySize'] = $regs[3];
 					$this->message[$pos]['arrayCols'] = $regs[4];
 				}
 			// specifies nil value (or not)
-			} elseif ($key_localpart == 'nil'){
+			} elseif ($key_localpart == 'nil') {
 				$this->message[$pos]['nil'] = ($value == 'true' || $value == '1');
 			// some other attribute
 			} elseif ($key != 'href' && $key != 'xmlns' && $key_localpart != 'encodingStyle' && $key_localpart != 'root') {
@@ -270,11 +270,11 @@ 
 				$this->default_namespace = $value;
 			}
 			// log id
-			if($key == 'id'){
+			if ($key == 'id') {
 				$this->ids[$value] = $pos;
 			}
 			// root
-			if($key_localpart == 'root' && $value == 1){
+			if ($key_localpart == 'root' && $value == 1) {
 				$this->status = 'method';
 				$this->root_struct_name = $name;
 				$this->root_struct = $pos;
@@ -284,17 +284,17 @@ 
             $attstr .= " $key=\"$value\"";
 		}
         // get namespace - must be done after namespace atts are processed
-		if(isset($prefix)){
+		if (isset($prefix)) {
 			$this->message[$pos]['namespace'] = $this->namespaces[$prefix];
 			$this->default_namespace = $this->namespaces[$prefix];
 		} else {
 			$this->message[$pos]['namespace'] = $this->default_namespace;
 		}
-        if($this->status == 'header'){
+        if ($this->status == 'header') {
         	if ($this->root_header != $pos) {
 	        	$this->responseHeaders .= "<" . (isset($prefix) ? $prefix . ':' : '') . "$name$attstr>";
 	        }
-        } elseif($this->root_struct_name != ''){
+        } elseif ($this->root_struct_name != '') {
         	$this->document .= "<" . (isset($prefix) ? $prefix . ':' : '') . "$name$attstr>";
         }
 	}
@@ -311,27 +311,27 @@ 
 		$pos = $this->depth_array[$this->depth--];
 
         // get element prefix
-		if(strpos($name,':')){
+		if (strpos($name, ':')) {
 			// get ns prefix
-			$prefix = substr($name,0,strpos($name,':'));
+			$prefix = substr($name, 0, strpos($name, ':'));
 			// get unqualified name
-			$name = substr(strstr($name,':'),1);
+			$name = substr(strstr($name, ':'), 1);
 		}
 		
 		// build to native type
-		if(isset($this->body_position) && $pos > $this->body_position){
+		if (isset($this->body_position) && $pos > $this->body_position) {
 			// deal w/ multirefs
-			if(isset($this->message[$pos]['attrs']['href'])){
+			if (isset($this->message[$pos]['attrs']['href'])) {
 				// get id
-				$id = substr($this->message[$pos]['attrs']['href'],1);
+				$id = substr($this->message[$pos]['attrs']['href'], 1);
 				// add placeholder to href array
 				$this->multirefs[$id][$pos] = 'placeholder';
 				// add set a reference to it as the result value
-				$this->message[$pos]['result'] =& $this->multirefs[$id][$pos];
+				$this->message[$pos]['result'] = & $this->multirefs[$id][$pos];
             // build complexType values
-			} elseif($this->message[$pos]['children'] != ''){
+			} elseif ($this->message[$pos]['children'] != '') {
 				// if result has already been generated (struct/array)
-				if(!isset($this->message[$pos]['result'])){
+				if (!isset($this->message[$pos]['result'])) {
 					$this->message[$pos]['result'] = $this->buildVal($pos);
 				}
 			// build complexType values of attributes and possibly simpleContent
@@ -380,15 +380,15 @@ 
 		}
 		
         // for doclit
-        if($this->status == 'header'){
+        if ($this->status == 'header') {
         	if ($this->root_header != $pos) {
 	        	$this->responseHeaders .= "</" . (isset($prefix) ? $prefix . ':' : '') . "$name>";
 	        }
-        } elseif($pos >= $this->root_struct){
+        } elseif ($pos >= $this->root_struct) {
         	$this->document .= "</" . (isset($prefix) ? $prefix . ':' : '') . "$name>";
         }
 		// switch status
-		if ($pos == $this->root_struct){
+		if ($pos == $this->root_struct) {
 			$this->status = 'body';
 			$this->root_struct_namespace = $this->message[$pos]['namespace'];
 		} elseif ($pos == $this->root_header) {
@@ -411,16 +411,16 @@ 
 	* @param    string $data element content
 	* @access   private
 	*/
-	public function character_data($parser, $data){
+	public function character_data($parser, $data) {
 		$pos = $this->depth_array[$this->depth];
-		if ($this->xml_encoding=='UTF-8'){
-			if($this->decode_utf8){
+		if ($this->xml_encoding == 'UTF-8') {
+			if ($this->decode_utf8) {
 				$data = utf8_decode($data);
 			}
 		}
         $this->message[$pos]['cdata'] .= $data;
         // for doclit
-        if($this->status == 'header'){
+        if ($this->status == 'header') {
         	$this->responseHeaders .= $data;
         } else {
         	$this->document .= $data;
@@ -434,7 +434,7 @@ 
 	* @access   public
 	* @deprecated	use get_soapbody instead
 	*/
-	public function get_response(){
+	public function get_response() {
 		return $this->soapresponse;
 	}
 
@@ -444,7 +444,7 @@ 
 	* @return	mixed
 	* @access   public
 	*/
-	public function get_soapbody(){
+	public function get_soapbody() {
 		return $this->soapresponse;
 	}
 
@@ -454,7 +454,7 @@ 
 	* @return	mixed
 	* @access   public
 	*/
-	public function get_soapheader(){
+	public function get_soapheader() {
 		return $this->soapheader;
 	}
 
@@ -464,7 +464,7 @@ 
 	* @return	string XML or empty if no Header
 	* @access   public
 	*/
-	public function getHeaders(){
+	public function getHeaders() {
 	    return $this->responseHeaders;
 	}
 
@@ -520,55 +520,55 @@ 
 	* @return	mixed	PHP value
 	* @access   private
 	*/
-	public function buildVal($pos){
-		if(!isset($this->message[$pos]['type'])){
+	public function buildVal($pos) {
+		if (!isset($this->message[$pos]['type'])) {
 			$this->message[$pos]['type'] = '';
 		}
-		$this->debug('in buildVal() for '.$this->message[$pos]['name']."(pos $pos) of type ".$this->message[$pos]['type']);
+		$this->debug('in buildVal() for ' . $this->message[$pos]['name'] . "(pos $pos) of type " . $this->message[$pos]['type']);
 		// if there are children...
-		if($this->message[$pos]['children'] != ''){
+		if ($this->message[$pos]['children'] != '') {
 			$this->debug('in buildVal, there are children');
-			$children = explode('|',$this->message[$pos]['children']);
+			$children = explode('|', $this->message[$pos]['children']);
 			array_shift($children); // knock off empty
 			// md array
-			if(isset($this->message[$pos]['arrayCols']) && $this->message[$pos]['arrayCols'] != ''){
-            	$r=0; // rowcount
-            	$c=0; // colcount
-            	foreach($children as $child_pos){
+			if (isset($this->message[$pos]['arrayCols']) && $this->message[$pos]['arrayCols'] != '') {
+            	$r = 0; // rowcount
+            	$c = 0; // colcount
+            	foreach ($children as $child_pos) {
 					$this->debug("in buildVal, got an MD array element: $r, $c");
 					$params[$r][] = $this->message[$child_pos]['result'];
 				    $c++;
-				    if($c == $this->message[$pos]['arrayCols']){
+				    if ($c == $this->message[$pos]['arrayCols']) {
 				    	$c = 0;
 						$r++;
 				    }
                 }
             // array
-			} elseif($this->message[$pos]['type'] == 'array' || $this->message[$pos]['type'] == 'Array'){
-                $this->debug('in buildVal, adding array '.$this->message[$pos]['name']);
-                foreach($children as $child_pos){
+			} elseif ($this->message[$pos]['type'] == 'array' || $this->message[$pos]['type'] == 'Array') {
+                $this->debug('in buildVal, adding array ' . $this->message[$pos]['name']);
+                foreach ($children as $child_pos) {
                 	$params[] = &$this->message[$child_pos]['result'];
                 }
             // apache Map type: java hashtable
-            } elseif($this->message[$pos]['type'] == 'Map' && $this->message[$pos]['type_namespace'] == 'http://xml.apache.org/xml-soap'){
-                $this->debug('in buildVal, Java Map '.$this->message[$pos]['name']);
-                foreach($children as $child_pos){
-                	$kv = explode("|",$this->message[$child_pos]['children']);
+            } elseif ($this->message[$pos]['type'] == 'Map' && $this->message[$pos]['type_namespace'] == 'http://xml.apache.org/xml-soap') {
+                $this->debug('in buildVal, Java Map ' . $this->message[$pos]['name']);
+                foreach ($children as $child_pos) {
+                	$kv = explode("|", $this->message[$child_pos]['children']);
                    	$params[$this->message[$kv[1]]['result']] = &$this->message[$kv[2]]['result'];
                 }
             // generic compound type
             //} elseif($this->message[$pos]['type'] == 'SOAPStruct' || $this->message[$pos]['type'] == 'struct') {
 		    } else {
 	    		// Apache Vector type: treat as an array
-                $this->debug('in buildVal, adding Java Vector or generic compound type '.$this->message[$pos]['name']);
+                $this->debug('in buildVal, adding Java Vector or generic compound type ' . $this->message[$pos]['name']);
 				if ($this->message[$pos]['type'] == 'Vector' && $this->message[$pos]['type_namespace'] == 'http://xml.apache.org/xml-soap') {
 					$notstruct = 1;
 				} else {
 					$notstruct = 0;
 	            }
             	//
-            	foreach($children as $child_pos){
-            		if($notstruct){
+            	foreach ($children as $child_pos) {
+            		if ($notstruct) {
             			$params[] = &$this->message[$child_pos]['result'];
             		} else {
             			if (isset($params[$this->message[$child_pos]['name']])) {