YetiForceCompany / YetiForceCRM

libraries/nusoap/nusoap.php

Spacing +11 added lines, -13 removed lines

@@ -2217,8 +2217,8 @@ 
 	public $persistentConnection = false;
 	public $ch = false; // cURL handle
 	public $ch_options = array(); // cURL custom options
-	public $use_curl = false;  // force cURL use
-	public $proxy = null;   // proxy information (associative array)
+	public $use_curl = false; // force cURL use
+	public $proxy = null; // proxy information (associative array)
 	public $username = '';
 	public $password = '';
 	public $authtype = '';
@@ -2654,7 +2654,7 @@ 
 			$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;
+				$digestRequest['nc'] = isset($digestRequest['nc']) ? $digestRequest['nc']++ : 1;
 
 				// 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
@@ -4104,7 +4104,7 @@ 
 			$call_arg = array($class, $method);
 		} else {
 			$this->debug('in invoke_method, calling instance method using call_user_func_array()');
-			$instance = new $class ();
+			$instance = new $class();
 			$call_arg = array(&$instance, $method);
 		}
 		if (is_array($this->methodparams)) {
@@ -4660,12 +4660,12 @@ 
 	public $timeout = 0;
 	public $response_timeout = 30;
 	public $curl_options = array(); // User-specified cURL options
-	public $use_curl = false;   // whether to always try to use cURL
+	public $use_curl = false; // whether to always try to use cURL
 	// for HTTP authentication
 	public $username = ''; // Username for HTTP authentication
 	public $password = ''; // Password for HTTP authentication
 	public $authtype = ''; // Type of HTTP authentication
-	public $certRequest = array();  // Certificate for HTTP SSL authentication
+	public $certRequest = array(); // Certificate for HTTP SSL authentication
 
 	/**
 	 * constructor
@@ -4779,11 +4779,9 @@ 
 				foreach ($bindingData['operations'] as $operation => $data) {
 					$this->debug('post-parse data gathering for ' . $operation);
 					$this->bindings[$binding]['operations'][$operation]['input'] = isset($this->bindings[$binding]['operations'][$operation]['input']) ?
-						array_merge($this->bindings[$binding]['operations'][$operation]['input'], $this->portTypes[$bindingData['portType']][$operation]['input']) :
-						$this->portTypes[$bindingData['portType']][$operation]['input'];
+						array_merge($this->bindings[$binding]['operations'][$operation]['input'], $this->portTypes[$bindingData['portType']][$operation]['input']) : $this->portTypes[$bindingData['portType']][$operation]['input'];
 					$this->bindings[$binding]['operations'][$operation]['output'] = isset($this->bindings[$binding]['operations'][$operation]['output']) ?
-						array_merge($this->bindings[$binding]['operations'][$operation]['output'], $this->portTypes[$bindingData['portType']][$operation]['output']) :
-						$this->portTypes[$bindingData['portType']][$operation]['output'];
+						array_merge($this->bindings[$binding]['operations'][$operation]['output'], $this->portTypes[$bindingData['portType']][$operation]['output']) : $this->portTypes[$bindingData['portType']][$operation]['output'];
 					if (isset($this->messages[$this->bindings[$binding]['operations'][$operation]['input']['message']])) {
 						$this->bindings[$binding]['operations'][$operation]['input']['parts'] = $this->messages[$this->bindings[$binding]['operations'][$operation]['input']['message']];
 					}
@@ -6303,7 +6301,7 @@ 
 					}
 				}
 				// if user took advantage of a minOccurs=0, then only serialize named parameters
-				if (isset($optionals) && (!isset($xvalue[$eName])) && ( (!isset($attrs['nillable'])) || $attrs['nillable'] != 'true')
+				if (isset($optionals) && (!isset($xvalue[$eName])) && ((!isset($attrs['nillable'])) || $attrs['nillable'] != 'true')
 				) {
 					if (isset($attrs['minOccurs']) && $attrs['minOccurs'] <> '0') {
 						$this->debug("apparent error: no value provided for element $eName with minOccurs=" . $attrs['minOccurs']);
@@ -6547,7 +6545,7 @@ 
 	public $root_struct_name = '';
 	public $root_struct_namespace = '';
 	public $root_header = '';
-	public $document = '';   // incoming SOAP body (text)
+	public $document = ''; // incoming SOAP body (text)
 	// determines where in the message we are (envelope,header,body,method)
 	public $status = '';
 	public $position = 0;
@@ -6563,7 +6561,7 @@ 
 	public $depth_array = array();
 	public $debug_flag = true;
 	public $soapresponse = NULL; // parsed SOAP Body
-	public $soapheader = NULL;  // parsed SOAP Header
+	public $soapheader = NULL; // parsed SOAP Header
 	public $responseHeaders = ''; // incoming SOAP headers (text)
 	public $body_position = 0;
 	// for multiref parsing:

libraries/nusoap/class.soap_transport_http.php

Spacing +103 added lines, -103 removed lines

@@ -29,18 +29,18 @@ 
 	public $incoming_cookies = array();
 	public $outgoing_payload = '';
 	public $incoming_payload = '';
-	public $response_status_line;	// HTTP response status line
+	public $response_status_line; // HTTP response status line
 	public $useSOAPAction = true;
 	public $persistentConnection = false;
-	public $ch = false;	// cURL handle
-	public $ch_options = array();	// cURL custom options
-	public $use_curl = false;		// force cURL use
-	public $proxy = null;			// proxy information (associative array)
+	public $ch = false; // cURL handle
+	public $ch_options = array(); // cURL custom options
+	public $use_curl = false; // force cURL use
+	public $proxy = null; // proxy information (associative array)
 	public $username = '';
 	public $password = '';
 	public $authtype = '';
 	public $digestRequest = array();
-	public $certRequest = array();	// keys must be cainfofile (optional), sslcertfile, sslkeyfile, passphrase, certpassword (optional), verifypeer (optional), verifyhost (optional)
+	public $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;
 				}

libraries/nusoap/class.nusoap_base.php

Indentation +244 added lines, -244 removed lines

@@ -104,21 +104,21 @@ 
 	 * @access private
 	 */
 	public $revision = '$Revision: 1.57 $';
-    /**
-     * Current error string (manipulated by getError/setError)
+	/**
+	 * Current error string (manipulated by getError/setError)
 	 *
 	 * @var string
 	 * @access private
 	 */
 	public $error_str = '';
-    /**
-     * Current debug string (manipulated by debug/appendDebug/clearDebug/getDebug/getDebugAsXMLComment)
+	/**
+	 * Current debug string (manipulated by debug/appendDebug/clearDebug/getDebug/getDebugAsXMLComment)
 	 *
 	 * @var string
 	 * @access private
 	 */
-    public $debug_str = '';
-    /**
+	public $debug_str = '';
+	/**
 	 * toggles automatic encoding of special characters as entities
 	 * (should always be true, I think)
 	 *
@@ -134,31 +134,31 @@ 
 	 */
 	public $debugLevel;
 
-    /**
-	* set schema version
-	*
-	* @var      string
-	* @access   public
-	*/
+	/**
+	 * set schema version
+	 *
+	 * @var      string
+	 * @access   public
+	 */
 	public $XMLSchemaVersion = 'http://www.w3.org/2001/XMLSchema';
 	
-    /**
-	* charset encoding for outgoing messages
-	*
-	* @var      string
-	* @access   public
-	*/
-    public $soap_defencoding = 'UTF-8';
+	/**
+	 * charset encoding for outgoing messages
+	 *
+	 * @var      string
+	 * @access   public
+	 */
+	public $soap_defencoding = 'UTF-8';
 	//var $soap_defencoding = 'UTF-8';
 
 	/**
-	* namespaces in an array of prefix => uri
-	*
-	* this is "seeded" by a set of constants, but it may be altered by code
-	*
-	* @var      array
-	* @access   public
-	*/
+	 * namespaces in an array of prefix => uri
+	 *
+	 * this is "seeded" by a set of constants, but it may be altered by code
+	 *
+	 * @var      array
+	 * @access   public
+	 */
 	public $namespaces = array(
 		'SOAP-ENV' => 'http://schemas.xmlsoap.org/soap/envelope/',
 		'xsd' => 'http://www.w3.org/2001/XMLSchema',
@@ -167,20 +167,20 @@ 
 		);
 
 	/**
-	* namespaces used in the current context, e.g. during serialization
-	*
-	* @var      array
-	* @access   private
-	*/
+	 * namespaces used in the current context, e.g. during serialization
+	 *
+	 * @var      array
+	 * @access   private
+	 */
 	public $usedNamespaces = array();
 
 	/**
-	* XML Schema types in an array of uri => (array of xml type => php type)
-	* is this legacy yet?
-	* no, this is used by the nusoap_xmlschema class to verify type => namespace mappings.
-	* @var      array
-	* @access   public
-	*/
+	 * XML Schema types in an array of uri => (array of xml type => php type)
+	 * is this legacy yet?
+	 * no, this is used by the nusoap_xmlschema class to verify type => namespace mappings.
+	 * @var      array
+	 * @access   public
+	 */
 	public $typemap = array(
 	'http://www.w3.org/2001/XMLSchema' => array(
 		'string'=>'string','boolean'=>'boolean','float'=>'double','double'=>'double','decimal'=>'double',
@@ -203,75 +203,75 @@ 
 		'timeInstant'=>'string','base64Binary'=>'string','base64'=>'string','ur-type'=>'array'),
 	'http://soapinterop.org/xsd' => array('SOAPStruct'=>'struct'),
 	'http://schemas.xmlsoap.org/soap/encoding/' => array('base64'=>'string','array'=>'array','Array'=>'array'),
-    'http://xml.apache.org/xml-soap' => array('Map')
+	'http://xml.apache.org/xml-soap' => array('Map')
 	);
 
 	/**
-	* XML entities to convert
-	*
-	* @var      array
-	* @access   public
-	* @deprecated
-	* @see	expandEntities
-	*/
+	 * XML entities to convert
+	 *
+	 * @var      array
+	 * @access   public
+	 * @deprecated
+	 * @see	expandEntities
+	 */
 	public $xmlEntities = array('quot' => '"','amp' => '&',
 		'lt' => '<','gt' => '>','apos' => "'");
 
 	/**
-	* constructor
-	*
-	* @access	public
-	*/
+	 * constructor
+	 *
+	 * @access	public
+	 */
 	public function nusoap_base() {
 		$this->debugLevel = $GLOBALS['_transient']['static']['nusoap_base']['globalDebugLevel'];
 	}
 
 	/**
-	* gets the global debug level, which applies to future instances
-	*
-	* @return	integer	Debug level 0-9, where 0 turns off
-	* @access	public
-	*/
+	 * gets the global debug level, which applies to future instances
+	 *
+	 * @return	integer	Debug level 0-9, where 0 turns off
+	 * @access	public
+	 */
 	public function getGlobalDebugLevel() {
 		return $GLOBALS['_transient']['static']['nusoap_base']['globalDebugLevel'];
 	}
 
 	/**
-	* sets the global debug level, which applies to future instances
-	*
-	* @param	int	$level	Debug level 0-9, where 0 turns off
-	* @access	public
-	*/
+	 * sets the global debug level, which applies to future instances
+	 *
+	 * @param	int	$level	Debug level 0-9, where 0 turns off
+	 * @access	public
+	 */
 	public function setGlobalDebugLevel($level) {
 		$GLOBALS['_transient']['static']['nusoap_base']['globalDebugLevel'] = $level;
 	}
 
 	/**
-	* gets the debug level for this instance
-	*
-	* @return	int	Debug level 0-9, where 0 turns off
-	* @access	public
-	*/
+	 * gets the debug level for this instance
+	 *
+	 * @return	int	Debug level 0-9, where 0 turns off
+	 * @access	public
+	 */
 	public function getDebugLevel() {
 		return $this->debugLevel;
 	}
 
 	/**
-	* sets the debug level for this instance
-	*
-	* @param	int	$level	Debug level 0-9, where 0 turns off
-	* @access	public
-	*/
+	 * sets the debug level for this instance
+	 *
+	 * @param	int	$level	Debug level 0-9, where 0 turns off
+	 * @access	public
+	 */
 	public function setDebugLevel($level) {
 		$this->debugLevel = $level;
 	}
 
 	/**
-	* adds debug data to the instance debug string with formatting
-	*
-	* @param    string $string debug data
-	* @access   private
-	*/
+	 * adds debug data to the instance debug string with formatting
+	 *
+	 * @param    string $string debug data
+	 * @access   private
+	 */
 	public function debug($string){
 		if ($this->debugLevel > 0) {
 			$this->appendDebug($this->getmicrotime().' '.get_class($this).": $string\n");
@@ -279,11 +279,11 @@ 
 	}
 
 	/**
-	* adds debug data to the instance debug string without formatting
-	*
-	* @param    string $string debug data
-	* @access   public
-	*/
+	 * adds debug data to the instance debug string without formatting
+	 *
+	 * @param    string $string debug data
+	 * @access   public
+	 */
 	public function appendDebug($string){
 		if ($this->debugLevel > 0) {
 			// it would be nice to use a memory stream here to use
@@ -293,10 +293,10 @@ 
 	}
 
 	/**
-	* clears the current debug data for this instance
-	*
-	* @access   public
-	*/
+	 * clears the current debug data for this instance
+	 *
+	 * @access   public
+	 */
 	public function clearDebug() {
 		// it would be nice to use a memory stream here to use
 		// memory more efficiently
@@ -304,11 +304,11 @@ 
 	}
 
 	/**
-	* gets the current debug data for this instance
-	*
-	* @return   debug data
-	* @access   public
-	*/
+	 * gets the current debug data for this instance
+	 *
+	 * @return   debug data
+	 * @access   public
+	 */
 	public function &getDebug() {
 		// it would be nice to use a memory stream here to use
 		// memory more efficiently
@@ -316,12 +316,12 @@ 
 	}
 
 	/**
-	* gets the current debug data for this instance as an XML comment
-	* this may change the contents of the debug data
-	*
-	* @return   debug data as an XML comment
-	* @access   public
-	*/
+	 * gets the current debug data for this instance as an XML comment
+	 * this may change the contents of the debug data
+	 *
+	 * @return   debug data as an XML comment
+	 * @access   public
+	 */
 	public function &getDebugAsXMLComment() {
 		// it would be nice to use a memory stream here to use
 		// memory more efficiently
@@ -329,32 +329,32 @@ 
 			$this->debug_str = str_replace('--', '- -', $this->debug_str);
 		}
 		$ret = "<!--\n" . $this->debug_str . "\n-->";
-    	return $ret;
+		return $ret;
 	}
 
 	/**
-	* expands entities, e.g. changes '<' to '&lt;'.
-	*
-	* @param	string	$val	The string in which to expand entities.
-	* @access	private
-	*/
+	 * expands entities, e.g. changes '<' to '&lt;'.
+	 *
+	 * @param	string	$val	The string in which to expand entities.
+	 * @access	private
+	 */
 	public function expandEntities($val) {
 		if ($this->charencoding) {
-	    	$val = str_replace('&', '&amp;', $val);
-	    	$val = str_replace("'", '&apos;', $val);
-	    	$val = str_replace('"', '&quot;', $val);
-	    	$val = str_replace('<', '&lt;', $val);
-	    	$val = str_replace('>', '&gt;', $val);
-	    }
-	    return $val;
+			$val = str_replace('&', '&amp;', $val);
+			$val = str_replace("'", '&apos;', $val);
+			$val = str_replace('"', '&quot;', $val);
+			$val = str_replace('<', '&lt;', $val);
+			$val = str_replace('>', '&gt;', $val);
+		}
+		return $val;
 	}
 
 	/**
-	* returns error string if present
-	*
-	* @return   mixed error string or false
-	* @access   public
-	*/
+	 * returns error string if present
+	 *
+	 * @return   mixed error string or false
+	 * @access   public
+	 */
 	public function getError(){
 		if($this->error_str != ''){
 			return $this->error_str;
@@ -363,24 +363,24 @@ 
 	}
 
 	/**
-	* sets error string
-	*
-	* @return   boolean $string error string
-	* @access   private
-	*/
+	 * sets error string
+	 *
+	 * @return   boolean $string error string
+	 * @access   private
+	 */
 	public function setError($str){
 		$this->error_str = $str;
 	}
 
 	/**
-	* detect if array is a simple array or a struct (associative array)
-	*
-	* @param	mixed	$val	The PHP array
-	* @return	string	(arraySimple|arrayStruct)
-	* @access	private
-	*/
+	 * detect if array is a simple array or a struct (associative array)
+	 *
+	 * @param	mixed	$val	The PHP array
+	 * @return	string	(arraySimple|arrayStruct)
+	 * @access	private
+	 */
 	public function isArraySimpleOrStruct($val) {
-        $keyList = array_keys($val);
+		$keyList = array_keys($val);
 		foreach ($keyList as $keyListValue) {
 			if (!is_int($keyListValue)) {
 				return 'arrayStruct';
@@ -390,33 +390,33 @@ 
 	}
 
 	/**
-	* serializes PHP values in accordance w/ section 5. Type information is
-	* not serialized if $use == 'literal'.
-	*
-	* @param	mixed	$val	The value to serialize
-	* @param	string	$name	The name (local part) of the XML element
-	* @param	string	$type	The XML schema type (local part) for the element
-	* @param	string	$name_ns	The namespace for the name of the XML element
-	* @param	string	$type_ns	The namespace for the type of the element
-	* @param	array	$attributes	The attributes to serialize as name=>value pairs
-	* @param	string	$use	The WSDL "use" (encoded|literal)
-	* @param	boolean	$soapval	Whether this is called from soapval.
-	* @return	string	The serialized element, possibly with child elements
-    * @access	public
-	*/
+	 * serializes PHP values in accordance w/ section 5. Type information is
+	 * not serialized if $use == 'literal'.
+	 *
+	 * @param	mixed	$val	The value to serialize
+	 * @param	string	$name	The name (local part) of the XML element
+	 * @param	string	$type	The XML schema type (local part) for the element
+	 * @param	string	$name_ns	The namespace for the name of the XML element
+	 * @param	string	$type_ns	The namespace for the type of the element
+	 * @param	array	$attributes	The attributes to serialize as name=>value pairs
+	 * @param	string	$use	The WSDL "use" (encoded|literal)
+	 * @param	boolean	$soapval	Whether this is called from soapval.
+	 * @return	string	The serialized element, possibly with child elements
+	 * @access	public
+	 */
 	public function serialize_val($val,$name=false,$type=false,$name_ns=false,$type_ns=false,$attributes=false,$use='encoded',$soapval=false) {
 		$this->debug("in serialize_val: name=$name, type=$type, name_ns=$name_ns, type_ns=$type_ns, use=$use, soapval=$soapval");
 		$this->appendDebug('value=' . $this->varDump($val));
 		$this->appendDebug('attributes=' . $this->varDump($attributes));
 		
-    	if (is_object($val) && get_class($val) == 'soapval' && (! $soapval)) {
-    		$this->debug("serialize_val: serialize soapval");
-        	$xml = $val->serialize($use);
+		if (is_object($val) && get_class($val) == 'soapval' && (! $soapval)) {
+			$this->debug("serialize_val: serialize soapval");
+			$xml = $val->serialize($use);
 			$this->appendDebug($val->getDebug());
 			$val->clearDebug();
 			$this->debug("serialize_val of soapval returning $xml");
 			return $xml;
-        }
+		}
 		// force valid name if necessary
 		if (is_numeric($name)) {
 			$name = '__numeric_' . $name;
@@ -425,7 +425,7 @@ 
 		}
 		// if name has ns, add ns prefix to name
 		$xmlns = '';
-        if($name_ns){
+		if($name_ns){
 			$prefix = 'nu'.rand(1000,9999);
 			$name = $prefix.':'.$name;
 			$xmlns .= " xmlns:$prefix=\"$name_ns\"";
@@ -433,7 +433,7 @@ 
 		// if type is prefixed, create type prefix
 		if($type_ns != '' && $type_ns == $this->namespaces['xsd']){
 			// need to fix this. shouldn't default to xsd if no ns specified
-		    // w/o checking against typemap
+			// w/o checking against typemap
 			$type_prefix = 'xsd';
 		} elseif($type_ns){
 			$type_prefix = 'ns'.rand(1000,9999);
@@ -448,12 +448,12 @@ 
 		}
 		// serialize null value
 		if (is_null($val)) {
-    		$this->debug("serialize_val: serialize null");
+			$this->debug("serialize_val: serialize null");
 			if ($use == 'literal') {
 				$xml = "<$name$xmlns$atts/>";
 				$this->debug("serialize_val returning $xml");
-	        	return $xml;
-        	} else {
+				return $xml;
+			} else {
 				if (isset($type) && isset($type_prefix)) {
 					$type_str = " xsi:type=\"$type_prefix:$type\"";
 				} else {
@@ -461,41 +461,41 @@ 
 				}
 				$xml = "<$name$xmlns$type_str$atts xsi:nil=\"true\"/>";
 				$this->debug("serialize_val returning $xml");
-	        	return $xml;
-        	}
+				return $xml;
+			}
 		}
-        // serialize if an xsd built-in primitive type
-        if($type != '' && isset($this->typemap[$this->XMLSchemaVersion][$type])){
-    		$this->debug("serialize_val: serialize xsd built-in primitive type");
-        	if (is_bool($val)) {
-        		if ($type == 'boolean') {
-	        		$val = $val ? 'true' : 'false';
-	        	} elseif (! $val) {
-	        		$val = 0;
-	        	}
+		// serialize if an xsd built-in primitive type
+		if($type != '' && isset($this->typemap[$this->XMLSchemaVersion][$type])){
+			$this->debug("serialize_val: serialize xsd built-in primitive type");
+			if (is_bool($val)) {
+				if ($type == 'boolean') {
+					$val = $val ? 'true' : 'false';
+				} elseif (! $val) {
+					$val = 0;
+				}
 			} else if (is_string($val)) {
 				$val = $this->expandEntities($val);
 			}
 			if ($use == 'literal') {
 				$xml = "<$name$xmlns$atts>$val</$name>";
 				$this->debug("serialize_val returning $xml");
-	        	return $xml;
-        	} else {
+				return $xml;
+			} else {
 				$xml = "<$name$xmlns xsi:type=\"xsd:$type\"$atts>$val</$name>";
 				$this->debug("serialize_val returning $xml");
-	        	return $xml;
-        	}
-        }
+				return $xml;
+			}
+		}
 		// detect type and serialize
 		$xml = '';
 		switch(true) {
 			case (is_bool($val) || $type == 'boolean'):
 		   		$this->debug("serialize_val: serialize boolean");
-        		if ($type == 'boolean') {
-	        		$val = $val ? 'true' : 'false';
-	        	} elseif (! $val) {
-	        		$val = 0;
-	        	}
+				if ($type == 'boolean') {
+					$val = $val ? 'true' : 'false';
+				} elseif (! $val) {
+					$val = 0;
+				}
 				if ($use == 'literal') {
 					$xml .= "<$name$xmlns$atts>$val</$name>";
 				} else {
@@ -529,12 +529,12 @@ 
 				break;
 			case is_object($val):
 		   		$this->debug("serialize_val: serialize object");
-		    	if (get_class($val) == 'soapval') {
-		    		$this->debug("serialize_val: serialize soapval object");
-		        	$pXml = $val->serialize($use);
+				if (get_class($val) == 'soapval') {
+					$this->debug("serialize_val: serialize soapval object");
+					$pXml = $val->serialize($use);
 					$this->appendDebug($val->getDebug());
 					$val->clearDebug();
-		        } else {
+				} else {
 					if (! $name) {
 						$name = get_class($val);
 						$this->debug("In serialize_val, used class name $name as element name");
@@ -560,19 +560,19 @@ 
 			case (is_array($val) || $type):
 				// detect if struct or array
 				$valueType = $this->isArraySimpleOrStruct($val);
-                if($valueType=='arraySimple' || preg_match('/^ArrayOf/',$type)){
+				if($valueType=='arraySimple' || preg_match('/^ArrayOf/',$type)){
 			   		$this->debug("serialize_val: serialize array");
 					$i = 0;
 					if(is_array($val) && count($val)> 0){
 						foreach($val as $v){
-	                    	if(is_object($v) && get_class($v) ==  'soapval'){
+							if(is_object($v) && get_class($v) ==  'soapval'){
 								$tt_ns = $v->type_ns;
 								$tt = $v->type;
 							} elseif (is_array($v)) {
 								$tt = $this->isArraySimpleOrStruct($v);
 							} else {
 								$tt = gettype($v);
-	                        }
+							}
 							$array_types[$tt] = 1;
 							$xml .= $this->serialize_val($v,'item',false,false,false,false,$use);
 							++$i;
@@ -655,19 +655,19 @@ 
 		return $xml;
 	}
 
-    /**
-    * serializes a message
-    *
-    * @param string $body the XML of the SOAP body
-    * @param mixed $headers optional string of XML with SOAP header content, or array of soapval objects for SOAP headers, or associative array
-    * @param array $namespaces optional the namespaces used in generating the body and headers
-    * @param string $style optional (rpc|document)
-    * @param string $use optional (encoded|literal)
-    * @param string $encodingStyle optional (usually 'http://schemas.xmlsoap.org/soap/encoding/' for encoded)
-    * @return string the message
-    * @access public
-    */
-    public function serializeEnvelope($body,$headers=false,$namespaces=array(),$style='rpc',$use='encoded',$encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'){
+	/**
+	 * serializes a message
+	 *
+	 * @param string $body the XML of the SOAP body
+	 * @param mixed $headers optional string of XML with SOAP header content, or array of soapval objects for SOAP headers, or associative array
+	 * @param array $namespaces optional the namespaces used in generating the body and headers
+	 * @param string $style optional (rpc|document)
+	 * @param string $use optional (encoded|literal)
+	 * @param string $encodingStyle optional (usually 'http://schemas.xmlsoap.org/soap/encoding/' for encoded)
+	 * @return string the message
+	 * @access public
+	 */
+	public function serializeEnvelope($body,$headers=false,$namespaces=array(),$style='rpc',$use='encoded',$encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'){
 
 	$this->debug("In serializeEnvelope length=" . strlen($body) . " body (max 1000 characters)=" . substr($body, 0, 1000) . " style=$style use=$use encodingStyle=$encodingStyle");
 	$this->debug("headers:");
@@ -676,7 +676,7 @@ 
 	$this->appendDebug($this->varDump($namespaces));
 
 	// serialize namespaces
-    $ns_string = '';
+	$ns_string = '';
 	foreach(array_merge($this->namespaces,$namespaces) as $k => $v){
 		$ns_string .= " xmlns:$k=\"$v\"";
 	}
@@ -709,7 +709,7 @@ 
 		$body.
 	"</SOAP-ENV:Body>".
 	"</SOAP-ENV:Envelope>";
-    }
+	}
 
 	/**
 	 * formats a string to be inserted into an HTML stream
@@ -719,18 +719,18 @@ 
 	 * @access public
 	 * @deprecated
 	 */
-    public function formatDump($str){
+	public function formatDump($str){
 		$str = htmlspecialchars($str);
 		return nl2br($str);
-    }
+	}
 
 	/**
-	* contracts (changes namespace to prefix) a qualified name
-	*
-	* @param    string $qname qname
-	* @return	string contracted qname
-	* @access   private
-	*/
+	 * contracts (changes namespace to prefix) a qualified name
+	 *
+	 * @param    string $qname qname
+	 * @return	string contracted qname
+	 * @access   private
+	 */
 	public function contractQname($qname){
 		// get element namespace
 		if (strrpos($qname, ':')) {
@@ -749,12 +749,12 @@ 
 	}
 
 	/**
-	* expands (changes prefix to namespace) a qualified name
-	*
-	* @param    string $qname qname
-	* @return	string expanded qname
-	* @access   private
-	*/
+	 * expands (changes prefix to namespace) a qualified name
+	 *
+	 * @param    string $qname qname
+	 * @return	string expanded qname
+	 * @access   private
+	 */
 	public function expandQname($qname){
 		// get element prefix
 		if(strpos($qname,':') && !preg_match('/^http:\/\//',$qname)){
@@ -772,14 +772,14 @@ 
 		}
 	}
 
-    /**
-    * returns the local part of a prefixed string
-    * returns the original string, if not prefixed
-    *
-    * @param string $str The prefixed string
-    * @return string The local part
-    * @access public
-    */
+	/**
+	 * returns the local part of a prefixed string
+	 * returns the original string, if not prefixed
+	 *
+	 * @param string $str The prefixed string
+	 * @return string The local part
+	 * @access public
+	 */
 	public function getLocalPart($str){
 		if($sstr = strrchr($str,':')){
 			// get unqualified name
@@ -790,13 +790,13 @@ 
 	}
 
 	/**
-    * returns the prefix part of a prefixed string
-    * returns false, if not prefixed
-    *
-    * @param string $str The prefixed string
-    * @return mixed The prefix or false if there is no prefix
-    * @access public
-    */
+	 * returns the prefix part of a prefixed string
+	 * returns false, if not prefixed
+	 *
+	 * @param string $str The prefixed string
+	 * @return mixed The prefix or false if there is no prefix
+	 * @access public
+	 */
 	public function getPrefix($str){
 		if($pos = strrpos($str,':')){
 			// get prefix
@@ -806,12 +806,12 @@ 
 	}
 
 	/**
-    * pass it a prefix, it returns a namespace
-    *
-    * @param string $prefix The prefix
-    * @return mixed The namespace, false if no namespace has the specified prefix
-    * @access public
-    */
+	 * pass it a prefix, it returns a namespace
+	 *
+	 * @param string $prefix The prefix
+	 * @return mixed The namespace, false if no namespace has the specified prefix
+	 * @access public
+	 */
 	public function getNamespaceFromPrefix($prefix){
 		if (isset($this->namespaces[$prefix])) {
 			return $this->namespaces[$prefix];
@@ -820,17 +820,17 @@ 
 	}
 
 	/**
-    * returns the prefix for a given namespace (or prefix)
-    * or false if no prefixes registered for the given namespace
-    *
-    * @param string $ns The namespace
-    * @return mixed The prefix, false if the namespace has no prefixes
-    * @access public
-    */
+	 * returns the prefix for a given namespace (or prefix)
+	 * or false if no prefixes registered for the given namespace
+	 *
+	 * @param string $ns The namespace
+	 * @return mixed The prefix, false if the namespace has no prefixes
+	 * @access public
+	 */
 	public function getPrefixFromNamespace($ns) {
 		foreach ($this->namespaces as $p => $n) {
 			if ($ns == $n || $ns == $p) {
-			    $this->usedNamespaces[$p] = $n;
+				$this->usedNamespaces[$p] = $n;
 				return $p;
 			}
 		}
@@ -838,11 +838,11 @@ 
 	}
 
 	/**
-    * returns the time in ODBC canonical form with microseconds
-    *
-    * @return string The time in ODBC canonical form with microseconds
-    * @access public
-    */
+	 * returns the time in ODBC canonical form with microseconds
+	 *
+	 * @return string The time in ODBC canonical form with microseconds
+	 * @access public
+	 */
 	public function getmicrotime() {
 		if (function_exists('gettimeofday')) {
 			$tod = gettimeofday();
@@ -862,17 +862,17 @@ 
 	 * @return string The output of var_dump
 	 * @access public
 	 */
-    public function varDump($data) {
+	public function varDump($data) {
 		$ret_val = var_export($data, true); 
 		return $ret_val;
 	}
 
 	/**
-	* represents the object as a string
-	*
-	* @return	string
-	* @access   public
-	*/
+	 * represents the object as a string
+	 *
+	 * @return	string
+	 * @access   public
+	 */
 	public function __toString() {
 		return $this->varDump($this);
 	}

Spacing +120 added lines, -120 removed lines

@@ -183,26 +183,26 @@ 
 	*/
 	public $typemap = array(
 	'http://www.w3.org/2001/XMLSchema' => array(
-		'string'=>'string','boolean'=>'boolean','float'=>'double','double'=>'double','decimal'=>'double',
-		'duration'=>'','dateTime'=>'string','time'=>'string','date'=>'string','gYearMonth'=>'',
-		'gYear'=>'','gMonthDay'=>'','gDay'=>'','gMonth'=>'','hexBinary'=>'string','base64Binary'=>'string',
+		'string'=>'string', 'boolean'=>'boolean', 'float'=>'double', 'double'=>'double', 'decimal'=>'double',
+		'duration'=>'', 'dateTime'=>'string', 'time'=>'string', 'date'=>'string', 'gYearMonth'=>'',
+		'gYear'=>'', 'gMonthDay'=>'', 'gDay'=>'', 'gMonth'=>'', 'hexBinary'=>'string', 'base64Binary'=>'string',
 		// abstract "any" types
-		'anyType'=>'string','anySimpleType'=>'string',
+		'anyType'=>'string', 'anySimpleType'=>'string',
 		// derived datatypes
-		'normalizedString'=>'string','token'=>'string','language'=>'','NMTOKEN'=>'','NMTOKENS'=>'','Name'=>'','NCName'=>'','ID'=>'',
-		'IDREF'=>'','IDREFS'=>'','ENTITY'=>'','ENTITIES'=>'','integer'=>'integer','nonPositiveInteger'=>'integer',
-		'negativeInteger'=>'integer','long'=>'integer','int'=>'integer','short'=>'integer','byte'=>'integer','nonNegativeInteger'=>'integer',
-		'unsignedLong'=>'','unsignedInt'=>'','unsignedShort'=>'','unsignedByte'=>'','positiveInteger'=>''),
+		'normalizedString'=>'string', 'token'=>'string', 'language'=>'', 'NMTOKEN'=>'', 'NMTOKENS'=>'', 'Name'=>'', 'NCName'=>'', 'ID'=>'',
+		'IDREF'=>'', 'IDREFS'=>'', 'ENTITY'=>'', 'ENTITIES'=>'', 'integer'=>'integer', 'nonPositiveInteger'=>'integer',
+		'negativeInteger'=>'integer', 'long'=>'integer', 'int'=>'integer', 'short'=>'integer', 'byte'=>'integer', 'nonNegativeInteger'=>'integer',
+		'unsignedLong'=>'', 'unsignedInt'=>'', 'unsignedShort'=>'', 'unsignedByte'=>'', 'positiveInteger'=>''),
 	'http://www.w3.org/2000/10/XMLSchema' => array(
-		'i4'=>'','int'=>'integer','boolean'=>'boolean','string'=>'string','double'=>'double',
-		'float'=>'double','dateTime'=>'string',
-		'timeInstant'=>'string','base64Binary'=>'string','base64'=>'string','ur-type'=>'array'),
+		'i4'=>'', 'int'=>'integer', 'boolean'=>'boolean', 'string'=>'string', 'double'=>'double',
+		'float'=>'double', 'dateTime'=>'string',
+		'timeInstant'=>'string', 'base64Binary'=>'string', 'base64'=>'string', 'ur-type'=>'array'),
 	'http://www.w3.org/1999/XMLSchema' => array(
-		'i4'=>'','int'=>'integer','boolean'=>'boolean','string'=>'string','double'=>'double',
-		'float'=>'double','dateTime'=>'string',
-		'timeInstant'=>'string','base64Binary'=>'string','base64'=>'string','ur-type'=>'array'),
+		'i4'=>'', 'int'=>'integer', 'boolean'=>'boolean', 'string'=>'string', 'double'=>'double',
+		'float'=>'double', 'dateTime'=>'string',
+		'timeInstant'=>'string', 'base64Binary'=>'string', 'base64'=>'string', 'ur-type'=>'array'),
 	'http://soapinterop.org/xsd' => array('SOAPStruct'=>'struct'),
-	'http://schemas.xmlsoap.org/soap/encoding/' => array('base64'=>'string','array'=>'array','Array'=>'array'),
+	'http://schemas.xmlsoap.org/soap/encoding/' => array('base64'=>'string', 'array'=>'array', 'Array'=>'array'),
     'http://xml.apache.org/xml-soap' => array('Map')
 	);
 
@@ -214,8 +214,8 @@ 
 	* @deprecated
 	* @see	expandEntities
 	*/
-	public $xmlEntities = array('quot' => '"','amp' => '&',
-		'lt' => '<','gt' => '>','apos' => "'");
+	public $xmlEntities = array('quot' => '"', 'amp' => '&',
+		'lt' => '<', 'gt' => '>', 'apos' => "'");
 
 	/**
 	* constructor
@@ -272,9 +272,9 @@ 
 	* @param    string $string debug data
 	* @access   private
 	*/
-	public function debug($string){
+	public function debug($string) {
 		if ($this->debugLevel > 0) {
-			$this->appendDebug($this->getmicrotime().' '.get_class($this).": $string\n");
+			$this->appendDebug($this->getmicrotime() . ' ' . get_class($this) . ": $string\n");
 		}
 	}
 
@@ -284,7 +284,7 @@ 
 	* @param    string $string debug data
 	* @access   public
 	*/
-	public function appendDebug($string){
+	public function appendDebug($string) {
 		if ($this->debugLevel > 0) {
 			// it would be nice to use a memory stream here to use
 			// memory more efficiently
@@ -355,8 +355,8 @@ 
 	* @return   mixed error string or false
 	* @access   public
 	*/
-	public function getError(){
-		if($this->error_str != ''){
+	public function getError() {
+		if ($this->error_str != '') {
 			return $this->error_str;
 		}
 		return false;
@@ -368,7 +368,7 @@ 
 	* @return   boolean $string error string
 	* @access   private
 	*/
-	public function setError($str){
+	public function setError($str) {
 		$this->error_str = $str;
 	}
 
@@ -404,12 +404,12 @@ 
 	* @return	string	The serialized element, possibly with child elements
     * @access	public
 	*/
-	public function serialize_val($val,$name=false,$type=false,$name_ns=false,$type_ns=false,$attributes=false,$use='encoded',$soapval=false) {
+	public function serialize_val($val, $name = false, $type = false, $name_ns = false, $type_ns = false, $attributes = false, $use = 'encoded', $soapval = false) {
 		$this->debug("in serialize_val: name=$name, type=$type, name_ns=$name_ns, type_ns=$type_ns, use=$use, soapval=$soapval");
 		$this->appendDebug('value=' . $this->varDump($val));
 		$this->appendDebug('attributes=' . $this->varDump($attributes));
 		
-    	if (is_object($val) && get_class($val) == 'soapval' && (! $soapval)) {
+    	if (is_object($val) && get_class($val) == 'soapval' && (!$soapval)) {
     		$this->debug("serialize_val: serialize soapval");
         	$xml = $val->serialize($use);
 			$this->appendDebug($val->getDebug());
@@ -420,30 +420,30 @@ 
 		// force valid name if necessary
 		if (is_numeric($name)) {
 			$name = '__numeric_' . $name;
-		} elseif (! $name) {
+		} elseif (!$name) {
 			$name = 'noname';
 		}
 		// if name has ns, add ns prefix to name
 		$xmlns = '';
-        if($name_ns){
-			$prefix = 'nu'.rand(1000,9999);
-			$name = $prefix.':'.$name;
+        if ($name_ns) {
+			$prefix = 'nu' . rand(1000, 9999);
+			$name = $prefix . ':' . $name;
 			$xmlns .= " xmlns:$prefix=\"$name_ns\"";
 		}
 		// if type is prefixed, create type prefix
-		if($type_ns != '' && $type_ns == $this->namespaces['xsd']){
+		if ($type_ns != '' && $type_ns == $this->namespaces['xsd']) {
 			// need to fix this. shouldn't default to xsd if no ns specified
 		    // w/o checking against typemap
 			$type_prefix = 'xsd';
-		} elseif($type_ns){
-			$type_prefix = 'ns'.rand(1000,9999);
+		} elseif ($type_ns) {
+			$type_prefix = 'ns' . rand(1000, 9999);
 			$xmlns .= " xmlns:$type_prefix=\"$type_ns\"";
 		}
 		// serialize attributes if present
 		$atts = '';
-		if($attributes){
-			foreach($attributes as $k => $v){
-				$atts .= " $k=\"".$this->expandEntities($v).'"';
+		if ($attributes) {
+			foreach ($attributes as $k => $v) {
+				$atts .= " $k=\"" . $this->expandEntities($v) . '"';
 			}
 		}
 		// serialize null value
@@ -465,12 +465,12 @@ 
         	}
 		}
         // serialize if an xsd built-in primitive type
-        if($type != '' && isset($this->typemap[$this->XMLSchemaVersion][$type])){
+        if ($type != '' && isset($this->typemap[$this->XMLSchemaVersion][$type])) {
     		$this->debug("serialize_val: serialize xsd built-in primitive type");
         	if (is_bool($val)) {
         		if ($type == 'boolean') {
 	        		$val = $val ? 'true' : 'false';
-	        	} elseif (! $val) {
+	        	} elseif (!$val) {
 	        		$val = 0;
 	        	}
 			} else if (is_string($val)) {
@@ -488,12 +488,12 @@ 
         }
 		// detect type and serialize
 		$xml = '';
-		switch(true) {
+		switch (true) {
 			case (is_bool($val) || $type == 'boolean'):
 		   		$this->debug("serialize_val: serialize boolean");
         		if ($type == 'boolean') {
 	        		$val = $val ? 'true' : 'false';
-	        	} elseif (! $val) {
+	        	} elseif (!$val) {
 	        		$val = 0;
 	        	}
 				if ($use == 'literal') {
@@ -510,7 +510,7 @@ 
 					$xml .= "<$name$xmlns xsi:type=\"xsd:int\"$atts>$val</$name>";
 				}
 				break;
-			case (is_float($val)|| is_double($val) || $type == 'float'):
+			case (is_float($val) || is_double($val) || $type == 'float'):
 		   		$this->debug("serialize_val: serialize float");
 				if ($use == 'literal') {
 					$xml .= "<$name$xmlns$atts>$val</$name>";
@@ -535,17 +535,17 @@ 
 					$this->appendDebug($val->getDebug());
 					$val->clearDebug();
 		        } else {
-					if (! $name) {
+					if (!$name) {
 						$name = get_class($val);
 						$this->debug("In serialize_val, used class name $name as element name");
 					} else {
 						$this->debug("In serialize_val, do not override name $name for element name for class " . get_class($val));
 					}
-					foreach(get_object_vars($val) as $k => $v){
-						$pXml = isset($pXml) ? $pXml.$this->serialize_val($v,$k,false,false,false,false,$use) : $this->serialize_val($v,$k,false,false,false,false,$use);
+					foreach (get_object_vars($val) as $k => $v) {
+						$pXml = isset($pXml) ? $pXml . $this->serialize_val($v, $k, false, false, false, false, $use) : $this->serialize_val($v, $k, false, false, false, false, $use);
 					}
 				}
-				if(isset($type) && isset($type_prefix)){
+				if (isset($type) && isset($type_prefix)) {
 					$type_str = " xsi:type=\"$type_prefix:$type\"";
 				} else {
 					$type_str = '';
@@ -560,12 +560,12 @@ 
 			case (is_array($val) || $type):
 				// detect if struct or array
 				$valueType = $this->isArraySimpleOrStruct($val);
-                if($valueType=='arraySimple' || preg_match('/^ArrayOf/',$type)){
+                if ($valueType == 'arraySimple' || preg_match('/^ArrayOf/', $type)) {
 			   		$this->debug("serialize_val: serialize array");
 					$i = 0;
-					if(is_array($val) && count($val)> 0){
-						foreach($val as $v){
-	                    	if(is_object($v) && get_class($v) ==  'soapval'){
+					if (is_array($val) && count($val) > 0) {
+						foreach ($val as $v) {
+	                    	if (is_object($v) && get_class($v) == 'soapval') {
 								$tt_ns = $v->type_ns;
 								$tt = $v->type;
 							} elseif (is_array($v)) {
@@ -574,23 +574,23 @@ 
 								$tt = gettype($v);
 	                        }
 							$array_types[$tt] = 1;
-							$xml .= $this->serialize_val($v,'item',false,false,false,false,$use);
+							$xml .= $this->serialize_val($v, 'item', false, false, false, false, $use);
 							++$i;
 						}
-						if(count($array_types) > 1){
+						if (count($array_types) > 1) {
 							$array_typename = 'xsd:anyType';
-						} elseif(isset($tt) && isset($this->typemap[$this->XMLSchemaVersion][$tt])) {
+						} elseif (isset($tt) && isset($this->typemap[$this->XMLSchemaVersion][$tt])) {
 							if ($tt == 'integer') {
 								$tt = 'int';
 							}
-							$array_typename = 'xsd:'.$tt;
-						} elseif(isset($tt) && $tt == 'arraySimple'){
+							$array_typename = 'xsd:' . $tt;
+						} elseif (isset($tt) && $tt == 'arraySimple') {
 							$array_typename = 'SOAP-ENC:Array';
-						} elseif(isset($tt) && $tt == 'arrayStruct'){
+						} elseif (isset($tt) && $tt == 'arrayStruct') {
 							$array_typename = 'unnamed_struct_use_soapval';
 						} else {
 							// if type is prefixed, create type prefix
-							if ($tt_ns != '' && $tt_ns == $this->namespaces['xsd']){
+							if ($tt_ns != '' && $tt_ns == $this->namespaces['xsd']) {
 								 $array_typename = 'xsd:' . $tt;
 							} elseif ($tt_ns) {
 								$tt_prefix = 'ns' . rand(1000, 9999);
@@ -606,7 +606,7 @@ 
 						} else if (isset($type) && isset($type_prefix)) {
 							$type_str = " xsi:type=\"$type_prefix:$type\"";
 						} else {
-							$type_str = " xsi:type=\"SOAP-ENC:Array\" SOAP-ENC:arrayType=\"".$array_typename."[$array_type]\"";
+							$type_str = " xsi:type=\"SOAP-ENC:Array\" SOAP-ENC:arrayType=\"" . $array_typename . "[$array_type]\"";
 						}
 					// empty array
 					} else {
@@ -618,11 +618,11 @@ 
 							$type_str = " xsi:type=\"SOAP-ENC:Array\" SOAP-ENC:arrayType=\"xsd:anyType[0]\"";
 						}
 					}
-					$xml = "<$name$xmlns$type_str$atts>".$xml."</$name>";
+					$xml = "<$name$xmlns$type_str$atts>" . $xml . "</$name>";
 				} else {
 					// got a struct
 			   		$this->debug("serialize_val: serialize struct");
-					if(isset($type) && isset($type_prefix)){
+					if (isset($type) && isset($type_prefix)) {
 						$type_str = " xsi:type=\"$type_prefix:$type\"";
 					} else {
 						$type_str = '';
@@ -632,15 +632,15 @@ 
 					} else {
 						$xml .= "<$name$xmlns$type_str$atts>";
 					}
-					foreach($val as $k => $v){
+					foreach ($val as $k => $v) {
 						// Apache Map
 						if ($type == 'Map' && $type_ns == 'http://xml.apache.org/xml-soap') {
 							$xml .= '<item>';
-							$xml .= $this->serialize_val($k,'key',false,false,false,false,$use);
-							$xml .= $this->serialize_val($v,'value',false,false,false,false,$use);
+							$xml .= $this->serialize_val($k, 'key', false, false, false, false, $use);
+							$xml .= $this->serialize_val($v, 'value', false, false, false, false, $use);
 							$xml .= '</item>';
 						} else {
-							$xml .= $this->serialize_val($v,$k,false,false,false,false,$use);
+							$xml .= $this->serialize_val($v, $k, false, false, false, false, $use);
 						}
 					}
 					$xml .= "</$name>";
@@ -648,7 +648,7 @@ 
 				break;
 			default:
 		   		$this->debug("serialize_val: serialize unknown");
-				$xml .= 'not detected, got '.gettype($val).' for '.$val;
+				$xml .= 'not detected, got ' . gettype($val) . ' for ' . $val;
 				break;
 		}
 		$this->debug("serialize_val returning $xml");
@@ -667,7 +667,7 @@ 
     * @return string the message
     * @access public
     */
-    public function serializeEnvelope($body,$headers=false,$namespaces=array(),$style='rpc',$use='encoded',$encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'){
+    public function serializeEnvelope($body, $headers = false, $namespaces = array(), $style = 'rpc', $use = 'encoded', $encodingStyle = 'http://schemas.xmlsoap.org/soap/encoding/') {
 
 	$this->debug("In serializeEnvelope length=" . strlen($body) . " body (max 1000 characters)=" . substr($body, 0, 1000) . " style=$style use=$use encodingStyle=$encodingStyle");
 	$this->debug("headers:");
@@ -677,15 +677,15 @@ 
 
 	// serialize namespaces
     $ns_string = '';
-	foreach(array_merge($this->namespaces,$namespaces) as $k => $v){
+	foreach (array_merge($this->namespaces, $namespaces) as $k => $v) {
 		$ns_string .= " xmlns:$k=\"$v\"";
 	}
-	if($encodingStyle) {
+	if ($encodingStyle) {
 		$ns_string = " SOAP-ENV:encodingStyle=\"$encodingStyle\"$ns_string";
 	}
 
 	// serialize headers
-	if($headers){
+	if ($headers) {
 		if (is_array($headers)) {
 			$xml = '';
 			foreach ($headers as $k => $v) {
@@ -698,16 +698,16 @@ 
 			$headers = $xml;
 			$this->debug("In serializeEnvelope, serialized array of headers to $headers");
 		}
-		$headers = "<SOAP-ENV:Header>".$headers."</SOAP-ENV:Header>";
+		$headers = "<SOAP-ENV:Header>" . $headers . "</SOAP-ENV:Header>";
 	}
 	// serialize envelope
 	return
-	'<?xml version="1.0" encoding="'.$this->soap_defencoding .'"?'.">".
-	'<SOAP-ENV:Envelope'.$ns_string.">".
-	$headers.
-	"<SOAP-ENV:Body>".
-		$body.
-	"</SOAP-ENV:Body>".
+	'<?xml version="1.0" encoding="' . $this->soap_defencoding . '"?' . ">" .
+	'<SOAP-ENV:Envelope' . $ns_string . ">" .
+	$headers .
+	"<SOAP-ENV:Body>" .
+		$body .
+	"</SOAP-ENV:Body>" .
 	"</SOAP-ENV:Envelope>";
     }
 
@@ -719,7 +719,7 @@ 
 	 * @access public
 	 * @deprecated
 	 */
-    public function formatDump($str){
+    public function formatDump($str) {
 		$str = htmlspecialchars($str);
 		return nl2br($str);
     }
@@ -731,7 +731,7 @@ 
 	* @return	string contracted qname
 	* @access   private
 	*/
-	public function contractQname($qname){
+	public function contractQname($qname) {
 		// get element namespace
 		if (strrpos($qname, ':')) {
 			// get unqualified name
@@ -755,15 +755,15 @@ 
 	* @return	string expanded qname
 	* @access   private
 	*/
-	public function expandQname($qname){
+	public function expandQname($qname) {
 		// get element prefix
-		if(strpos($qname,':') && !preg_match('/^http:\/\//',$qname)){
+		if (strpos($qname, ':') && !preg_match('/^http:\/\//', $qname)) {
 			// get unqualified name
-			$name = substr(strstr($qname,':'),1);
+			$name = substr(strstr($qname, ':'), 1);
 			// get ns prefix
-			$prefix = substr($qname,0,strpos($qname,':'));
-			if(isset($this->namespaces[$prefix])){
-				return $this->namespaces[$prefix].':'.$name;
+			$prefix = substr($qname, 0, strpos($qname, ':'));
+			if (isset($this->namespaces[$prefix])) {
+				return $this->namespaces[$prefix] . ':' . $name;
 			} else {
 				return $qname;
 			}
@@ -780,10 +780,10 @@ 
     * @return string The local part
     * @access public
     */
-	public function getLocalPart($str){
-		if($sstr = strrchr($str,':')){
+	public function getLocalPart($str) {
+		if ($sstr = strrchr($str, ':')) {
 			// get unqualified name
-			return substr( $sstr, 1 );
+			return substr($sstr, 1);
 		} else {
 			return $str;
 		}
@@ -797,10 +797,10 @@ 
     * @return mixed The prefix or false if there is no prefix
     * @access public
     */
-	public function getPrefix($str){
-		if($pos = strrpos($str,':')){
+	public function getPrefix($str) {
+		if ($pos = strrpos($str, ':')) {
 			// get prefix
-			return substr($str,0,$pos);
+			return substr($str, 0, $pos);
 		}
 		return false;
 	}
@@ -812,7 +812,7 @@ 
     * @return mixed The namespace, false if no namespace has the specified prefix
     * @access public
     */
-	public function getNamespaceFromPrefix($prefix){
+	public function getNamespaceFromPrefix($prefix) {
 		if (isset($this->namespaces[$prefix])) {
 			return $this->namespaces[$prefix];
 		}
@@ -890,8 +890,8 @@ 
 * @return	mixed ISO 8601 date string or false
 * @access   public
 */
-function timestamp_to_iso8601($timestamp,$utc=true){
-	$datestr = date('Y-m-d\TH:i:sO',$timestamp);
+function timestamp_to_iso8601($timestamp, $utc = true) {
+	$datestr = date('Y-m-d\TH:i:sO', $timestamp);
 	$pos = strrpos($datestr, "+");
 	if ($pos === false) {
 		$pos = strrpos($datestr, "-");
@@ -901,20 +901,20 @@ 
 			$datestr = substr($datestr, 0, $pos + 3) . ':' . substr($datestr, -2);
 		}
 	}
-	if($utc){
-		$pattern = '/'.
-		'([0-9]{4})-'.	// centuries & years CCYY-
-		'([0-9]{2})-'.	// months MM-
-		'([0-9]{2})'.	// days DD
-		'T'.			// separator T
-		'([0-9]{2}):'.	// hours hh:
-		'([0-9]{2}):'.	// minutes mm:
-		'([0-9]{2})(\.[0-9]*)?'. // seconds ss.ss...
-		'(Z|[+\-][0-9]{2}:?[0-9]{2})?'. // Z to indicate UTC, -/+HH:MM:SS.SS... for local tz's
+	if ($utc) {
+		$pattern = '/' .
+		'([0-9]{4})-' . // centuries & years CCYY-
+		'([0-9]{2})-' . // months MM-
+		'([0-9]{2})' . // days DD
+		'T' . // separator T
+		'([0-9]{2}):' . // hours hh:
+		'([0-9]{2}):' . // minutes mm:
+		'([0-9]{2})(\.[0-9]*)?' . // seconds ss.ss...
+		'(Z|[+\-][0-9]{2}:?[0-9]{2})?' . // Z to indicate UTC, -/+HH:MM:SS.SS... for local tz's
 		'/';
 
-		if(preg_match($pattern,$datestr,$regs)){
-			return sprintf('%04d-%02d-%02dT%02d:%02d:%02dZ',$regs[1],$regs[2],$regs[3],$regs[4],$regs[5],$regs[6]);
+		if (preg_match($pattern, $datestr, $regs)) {
+			return sprintf('%04d-%02d-%02dT%02d:%02d:%02dZ', $regs[1], $regs[2], $regs[3], $regs[4], $regs[5], $regs[6]);
 		}
 		return false;
 	} else {
@@ -929,27 +929,27 @@ 
 * @return	mixed Unix timestamp (int) or false
 * @access   public
 */
-function iso8601_to_timestamp($datestr){
-	$pattern = '/'.
-	'([0-9]{4})-'.	// centuries & years CCYY-
-	'([0-9]{2})-'.	// months MM-
-	'([0-9]{2})'.	// days DD
-	'T'.			// separator T
-	'([0-9]{2}):'.	// hours hh:
-	'([0-9]{2}):'.	// minutes mm:
-	'([0-9]{2})(\.[0-9]+)?'. // seconds ss.ss...
-	'(Z|[+\-][0-9]{2}:?[0-9]{2})?'. // Z to indicate UTC, -/+HH:MM:SS.SS... for local tz's
+function iso8601_to_timestamp($datestr) {
+	$pattern = '/' .
+	'([0-9]{4})-' . // centuries & years CCYY-
+	'([0-9]{2})-' . // months MM-
+	'([0-9]{2})' . // days DD
+	'T' . // separator T
+	'([0-9]{2}):' . // hours hh:
+	'([0-9]{2}):' . // minutes mm:
+	'([0-9]{2})(\.[0-9]+)?' . // seconds ss.ss...
+	'(Z|[+\-][0-9]{2}:?[0-9]{2})?' . // Z to indicate UTC, -/+HH:MM:SS.SS... for local tz's
 	'/';
-	if(preg_match($pattern,$datestr,$regs)){
+	if (preg_match($pattern, $datestr, $regs)) {
 		// not utc
-		if($regs[8] != 'Z'){
-			$op = substr($regs[8],0,1);
-			$h = substr($regs[8],1,2);
-			$m = substr($regs[8],strlen($regs[8])-2,2);
-			if($op == '-'){
+		if ($regs[8] != 'Z') {
+			$op = substr($regs[8], 0, 1);
+			$h = substr($regs[8], 1, 2);
+			$m = substr($regs[8], strlen($regs[8]) - 2, 2);
+			if ($op == '-') {
 				$regs[4] = $regs[4] + $h;
 				$regs[5] = $regs[5] + $m;
-			} elseif($op == '+'){
+			} elseif ($op == '+') {
 				$regs[4] = $regs[4] - $h;
 				$regs[5] = $regs[5] - $m;
 			}

vtlib/thirdparty/dUnzip2.inc.php

Spacing +11 added lines, -18 removed lines

@@ -80,7 +80,7 @@ 
 	public $fileName;
 	public $compressedList; // You will problably use only this one!
 	public $centralDirList; // Central dir list... It's a kind of 'extra attributes' for a set of files
-	public $endOfCentral;   // End of central dir, contains ZIP Comments
+	public $endOfCentral; // End of central dir, contains ZIP Comments
 	public $debug;
 	// Private
 	public $fh;
@@ -188,15 +188,13 @@ 
 	{
 		return
 			isset($this->centralDirList[$compressedFileName]) ?
-			$this->centralDirList[$compressedFileName] :
-			false;
+			$this->centralDirList[$compressedFileName] : false;
 	}
 
 	public function getZipInfo($detail = false)
 	{
 		return $detail ?
-			$this->endOfCentral[$detail] :
-			$this->endOfCentral;
+			$this->endOfCentral[$detail] : $this->endOfCentral;
 	}
 
 	public function unzip($compressedFileName, $targetFileName = false, $applyChmod = 0644)
@@ -218,8 +216,7 @@ 
 		if (!$fdetails['uncompressed_size']) {
 			$this->debugMsg(1, "File '<b>$compressedFileName</b>' is empty.");
 			return $targetFileName ?
-				file_put_contents($targetFileName, "") :
-				"";
+				file_put_contents($targetFileName, "") : "";
 		}
 
 		fseek($this->fh, $fdetails['contents-startOffset']);
@@ -263,8 +260,7 @@ 
 					continue;
 
 				$maintainStructure ?
-						$this->unzip($fileName, "$targetDir/$fileName", $applyChmod) :
-						$this->unzip($fileName, "$targetDir/" . basename($fileName), $applyChmod);
+						$this->unzip($fileName, "$targetDir/$fileName", $applyChmod) : $this->unzip($fileName, "$targetDir/" . basename($fileName), $applyChmod);
 			}
 	}
 
@@ -286,8 +282,7 @@ 
 			case 0:
 				// Not compressed
 				return $targetFileName ?
-					file_put_contents($targetFileName, $content) :
-					$content;
+					file_put_contents($targetFileName, $content) : $content;
 			case 1:
 				$this->debugMsg(2, "Shrunk mode is not supported... yet?");
 				return false;
@@ -306,8 +301,7 @@ 
 			case 8:
 				// Deflate
 				return $targetFileName ?
-					file_put_contents($targetFileName, gzinflate($content, $uncompressedSize)) :
-					gzinflate($content, $uncompressedSize);
+					file_put_contents($targetFileName, gzinflate($content, $uncompressedSize)) : gzinflate($content, $uncompressedSize);
 			case 9:
 				$this->debugMsg(2, "Enhanced Deflating is not supported... yet?");
 				return false;
@@ -317,8 +311,7 @@ 
 			case 12:
 				// Bzip2
 				return $targetFileName ?
-					file_put_contents($targetFileName, bzdecompress($content)) :
-					bzdecompress($content);
+					file_put_contents($targetFileName, bzdecompress($content)) : bzdecompress($content);
 			case 18:
 				$this->debugMsg(2, "IBM TERSE is not supported... yet?");
 				return false;
@@ -378,7 +371,7 @@ 
 					$dir['compression_method'] = unpack("v", fread($fh, 2)); // compression method
 					$dir['lastmod_time'] = unpack("v", fread($fh, 2)); // last mod file time
 					$dir['lastmod_date'] = unpack("v", fread($fh, 2)); // last mod file date
-					$dir['crc-32'] = fread($fh, 4);	 // crc-32
+					$dir['crc-32'] = fread($fh, 4); // crc-32
 					$dir['compressed_size'] = unpack("V", fread($fh, 4)); // compressed size
 					$dir['uncompressed_size'] = unpack("V", fread($fh, 4)); // uncompressed size
 					$fileNameLength = unpack("v", fread($fh, 2)); // filename length
@@ -389,7 +382,7 @@ 
 					$dir['external_attributes1'] = unpack("v", fread($fh, 2)); // external file attributes-byte2
 					$dir['external_attributes2'] = unpack("v", fread($fh, 2)); // external file attributes
 					$dir['relative_offset'] = unpack("V", fread($fh, 4)); // relative offset of local header
-					$dir['file_name'] = fread($fh, $fileNameLength[1]);		// filename
+					$dir['file_name'] = fread($fh, $fileNameLength[1]); // filename
 					$dir['extra_field'] = $extraFieldLength[1] ? fread($fh, $extraFieldLength[1]) : ''; // extra field
 					$dir['file_comment'] = $fileCommentLength[1] ? fread($fh, $fileCommentLength[1]) : ''; // file comment			
 					// Convert the date and time, from MS-DOS format to UNIX Timestamp
@@ -489,7 +482,7 @@ 
 			$file['compression_method'] = unpack("v", fread($fh, 2)); // compression method
 			$file['lastmod_time'] = unpack("v", fread($fh, 2)); // last mod file time
 			$file['lastmod_date'] = unpack("v", fread($fh, 2)); // last mod file date
-			$file['crc-32'] = fread($fh, 4);	 // crc-32
+			$file['crc-32'] = fread($fh, 4); // crc-32
 			$file['compressed_size'] = unpack("V", fread($fh, 4)); // compressed size
 			$file['uncompressed_size'] = unpack("V", fread($fh, 4)); // uncompressed size
 			$fileNameLength = unpack("v", fread($fh, 2)); // filename length

vtlib/thirdparty/network/Net/Socket.php

Indentation +554 added lines, -554 removed lines

@@ -34,559 +34,559 @@
  */
 class Net_Socket extends PEAR {
 
-    /**
-     * Socket file pointer.
-     * @var resource $fp
-     */
-    public $fp = null;
-
-    /**
-     * Whether the socket is blocking. Defaults to true.
-     * @var boolean $blocking
-     */
-    public $blocking = true;
-
-    /**
-     * Whether the socket is persistent. Defaults to false.
-     * @var boolean $persistent
-     */
-    public $persistent = false;
-
-    /**
-     * The IP address to connect to.
-     * @var string $addr
-     */
-    public $addr = '';
-
-    /**
-     * The port number to connect to.
-     * @var integer $port
-     */
-    public $port = 0;
-
-    /**
-     * Number of seconds to wait on socket connections before assuming
-     * there's no more data. Defaults to no timeout.
-     * @var integer $timeout
-     */
-    public $timeout = false;
-
-    /**
-     * Number of bytes to read at a time in readLine() and
-     * readAll(). Defaults to 2048.
-     * @var integer $lineLength
-     */
-    public $lineLength = 2048;
-
-    /**
-     * Connect to the specified port. If called when the socket is
-     * already connected, it disconnects and connects again.
-     *
-     * @param string  $addr        IP address or host name.
-     * @param integer $port        TCP port number.
-     * @param boolean $persistent  (optional) Whether the connection is
-     *                             persistent (kept open between requests
-     *                             by the web server).
-     * @param integer $timeout     (optional) How long to wait for data.
-     * @param array   $options     See options for stream_context_create.
-     *
-     * @access public
-     *
-     * @return boolean | PEAR_Error  True on success or a PEAR_Error on failure.
-     */
-    public function connect($addr, $port = 0, $persistent = null, $timeout = null, $options = null)
-    {
-        if (is_resource($this->fp)) {
-            @fclose($this->fp);
-            $this->fp = null;
-        }
-
-        if (!$addr) {
-            return $this->raiseError('$addr cannot be empty');
-        } elseif (strspn($addr, '.0123456789') == strlen($addr) ||
-                  strstr($addr, '/') !== false) {
-            $this->addr = $addr;
-        } else {
-            $this->addr = @gethostbyname($addr);
-        }
-
-        $this->port = $port % 65536;
-
-        if ($persistent !== null) {
-            $this->persistent = $persistent;
-        }
-
-        if ($timeout !== null) {
-            $this->timeout = $timeout;
-        }
-
-        $openfunc = $this->persistent ? 'pfsockopen' : 'fsockopen';
-        $errno = 0;
-        $errstr = '';
-        $old_track_errors = @ini_set('track_errors', 1);
-        if ($options && function_exists('stream_context_create')) {
-            if ($this->timeout) {
-                $timeout = $this->timeout;
-            } else {
-                $timeout = 0;
-            }
-            $context = stream_context_create($options);
-
-            // Since PHP 5 fsockopen doesn't allow context specification
-            if (function_exists('stream_socket_client')) {
-                $flags = $this->persistent ? STREAM_CLIENT_PERSISTENT : STREAM_CLIENT_CONNECT;
-                $addr = $this->addr . ':' . $this->port;
-                $fp = stream_socket_client($addr, $errno, $errstr, $timeout, $flags, $context);
-            } else {
-                $fp = @$openfunc($this->addr, $this->port, $errno, $errstr, $timeout, $context);
-            }
-        } else {
-            if ($this->timeout) {
-                $fp = @$openfunc($this->addr, $this->port, $errno, $errstr, $this->timeout);
-            } else {
-                $fp = @$openfunc($this->addr, $this->port, $errno, $errstr);
-            }
-        }
-
-        if (!$fp) {
-            if ($errno == 0 && isset($php_errormsg)) {
-                $errstr = $php_errormsg;
-            }
-            @ini_set('track_errors', $old_track_errors);
-            return $this->raiseError($errstr, $errno);
-        }
-
-        @ini_set('track_errors', $old_track_errors);
-        $this->fp = $fp;
-
-        return $this->setBlocking($this->blocking);
-    }
-
-    /**
-     * Disconnects from the peer, closes the socket.
-     *
-     * @access public
-     * @return mixed true on success or a PEAR_Error instance otherwise
-     */
-    public function disconnect()
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        @fclose($this->fp);
-        $this->fp = null;
-        return true;
-    }
-
-    /**
-     * Find out if the socket is in blocking mode.
-     *
-     * @access public
-     * @return boolean  The current blocking mode.
-     */
-    public function isBlocking()
-    {
-        return $this->blocking;
-    }
-
-    /**
-     * Sets whether the socket connection should be blocking or
-     * not. A read call to a non-blocking socket will return immediately
-     * if there is no data available, whereas it will block until there
-     * is data for blocking sockets.
-     *
-     * @param boolean $mode  True for blocking sockets, false for nonblocking.
-     * @access public
-     * @return mixed true on success or a PEAR_Error instance otherwise
-     */
-    public function setBlocking($mode)
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        $this->blocking = $mode;
-        socket_set_blocking($this->fp, $this->blocking);
-        return true;
-    }
-
-    /**
-     * Sets the timeout value on socket descriptor,
-     * expressed in the sum of seconds and microseconds
-     *
-     * @param integer $seconds  Seconds.
-     * @param integer $microseconds  Microseconds.
-     * @access public
-     * @return mixed true on success or a PEAR_Error instance otherwise
-     */
-    public function setTimeout($seconds, $microseconds)
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        return socket_set_timeout($this->fp, $seconds, $microseconds);
-    }
-
-    /**
-     * Sets the file buffering size on the stream.
-     * See php's stream_set_write_buffer for more information.
-     *
-     * @param integer $size     Write buffer size.
-     * @access public
-     * @return mixed on success or an PEAR_Error object otherwise
-     */
-    public function setWriteBuffer($size)
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        $returned = stream_set_write_buffer($this->fp, $size);
-        if ($returned == 0) {
-            return true;
-        }
-        return $this->raiseError('Cannot set write buffer.');
-    }
-
-    /**
-     * Returns information about an existing socket resource.
-     * Currently returns four entries in the result array:
-     *
-     * <p>
-     * timed_out (bool) - The socket timed out waiting for data<br>
-     * blocked (bool) - The socket was blocked<br>
-     * eof (bool) - Indicates EOF event<br>
-     * unread_bytes (int) - Number of bytes left in the socket buffer<br>
-     * </p>
-     *
-     * @access public
-     * @return mixed Array containing information about existing socket resource or a PEAR_Error instance otherwise
-     */
-    public function getStatus()
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        return socket_get_status($this->fp);
-    }
-
-    /**
-     * Get a specified line of data
-     *
-     * @access public
-     * @return $size bytes of data from the socket, or a PEAR_Error if
-     *         not connected.
-     */
-    public function gets($size)
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        return @fgets($this->fp, $size);
-    }
-
-    /**
-     * Read a specified amount of data. This is guaranteed to return,
-     * and has the added benefit of getting everything in one fread()
-     * chunk; if you know the size of the data you're getting
-     * beforehand, this is definitely the way to go.
-     *
-     * @param integer $size  The number of bytes to read from the socket.
-     * @access public
-     * @return $size bytes of data from the socket, or a PEAR_Error if
-     *         not connected.
-     */
-    public function read($size)
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        return @fread($this->fp, $size);
-    }
-
-    /**
-     * Write a specified amount of data.
-     *
-     * @param string  $data       Data to write.
-     * @param integer $blocksize  Amount of data to write at once.
-     *                            NULL means all at once.
-     *
-     * @access public
-     * @return mixed If the socket is not connected, returns an instance of PEAR_Error
-     *               If the write succeeds, returns the number of bytes written
-     *               If the write fails, returns false.
-     */
-    public function write($data, $blocksize = null)
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        if (is_null($blocksize) && !OS_WINDOWS) {
-            return @fwrite($this->fp, $data);
-        } else {
-            if (is_null($blocksize)) {
-                $blocksize = 1024;
-            }
-
-            $pos = 0;
-            $size = strlen($data);
-            while ($pos < $size) {
-                $written = @fwrite($this->fp, substr($data, $pos, $blocksize));
-                if ($written === false) {
-                    return false;
-                }
-                $pos += $written;
-            }
-
-            return $pos;
-        }
-    }
-
-    /**
-     * Write a line of data to the socket, followed by a trailing "\r\n".
-     *
-     * @access public
-     * @return mixed fputs result, or an error
-     */
-    public function writeLine($data)
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        return fwrite($this->fp, $data . "\r\n");
-    }
-
-    /**
-     * Tests for end-of-file on a socket descriptor.
-     *
-     * Also returns true if the socket is disconnected.
-     *
-     * @access public
-     * @return bool
-     */
-    public function eof()
-    {
-        return (!is_resource($this->fp) || feof($this->fp));
-    }
-
-    /**
-     * Reads a byte of data
-     *
-     * @access public
-     * @return 1 byte of data from the socket, or a PEAR_Error if
-     *         not connected.
-     */
-    public function readByte()
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        return ord(@fread($this->fp, 1));
-    }
-
-    /**
-     * Reads a word of data
-     *
-     * @access public
-     * @return 1 word of data from the socket, or a PEAR_Error if
-     *         not connected.
-     */
-    public function readWord()
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        $buf = @fread($this->fp, 2);
-        return (ord($buf[0]) + (ord($buf[1]) << 8));
-    }
-
-    /**
-     * Reads an int of data
-     *
-     * @access public
-     * @return integer  1 int of data from the socket, or a PEAR_Error if
-     *                  not connected.
-     */
-    public function readInt()
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        $buf = @fread($this->fp, 4);
-        return (ord($buf[0]) + (ord($buf[1]) << 8) +
-                (ord($buf[2]) << 16) + (ord($buf[3]) << 24));
-    }
-
-    /**
-     * Reads a zero-terminated string of data
-     *
-     * @access public
-     * @return string, or a PEAR_Error if
-     *         not connected.
-     */
-    public function readString()
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        $string = '';
-        while (($char = @fread($this->fp, 1)) != "\x00")  {
-            $string .= $char;
-        }
-        return $string;
-    }
-
-    /**
-     * Reads an IP Address and returns it in a dot formatted string
-     *
-     * @access public
-     * @return Dot formatted string, or a PEAR_Error if
-     *         not connected.
-     */
-    public function readIPAddress()
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        $buf = @fread($this->fp, 4);
-        return sprintf('%d.%d.%d.%d', ord($buf[0]), ord($buf[1]),
-                       ord($buf[2]), ord($buf[3]));
-    }
-
-    /**
-     * Read until either the end of the socket or a newline, whichever
-     * comes first. Strips the trailing newline from the returned data.
-     *
-     * @access public
-     * @return All available data up to a newline, without that
-     *         newline, or until the end of the socket, or a PEAR_Error if
-     *         not connected.
-     */
-    public function readLine()
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        $line = '';
-        $timeout = time() + $this->timeout;
-        while (!feof($this->fp) && (!$this->timeout || time() < $timeout)) {
-            $line .= @fgets($this->fp, $this->lineLength);
-            if (substr($line, -1) == "\n") {
-                return rtrim($line, "\r\n");
-            }
-        }
-        return $line;
-    }
-
-    /**
-     * Read until the socket closes, or until there is no more data in
-     * the inner PHP buffer. If the inner buffer is empty, in blocking
-     * mode we wait for at least 1 byte of data. Therefore, in
-     * blocking mode, if there is no data at all to be read, this
-     * function will never exit (unless the socket is closed on the
-     * remote end).
-     *
-     * @access public
-     *
-     * @return string  All data until the socket closes, or a PEAR_Error if
-     *                 not connected.
-     */
-    public function readAll()
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        $data = '';
-        while (!feof($this->fp)) {
-            $data .= @fread($this->fp, $this->lineLength);
-        }
-        return $data;
-    }
-
-    /**
-     * Runs the equivalent of the select() system call on the socket
-     * with a timeout specified by tv_sec and tv_usec.
-     *
-     * @param integer $state    Which of read/write/error to check for.
-     * @param integer $tv_sec   Number of seconds for timeout.
-     * @param integer $tv_usec  Number of microseconds for timeout.
-     *
-     * @access public
-     * @return False if select fails, integer describing which of read/write/error
-     *         are ready, or PEAR_Error if not connected.
-     */
-    public function select($state, $tv_sec, $tv_usec = 0)
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        $read = null;
-        $write = null;
-        $except = null;
-        if ($state & NET_SOCKET_READ) {
-            $read[] = $this->fp;
-        }
-        if ($state & NET_SOCKET_WRITE) {
-            $write[] = $this->fp;
-        }
-        if ($state & NET_SOCKET_ERROR) {
-            $except[] = $this->fp;
-        }
-        if (false === ($sr = stream_select($read, $write, $except, $tv_sec, $tv_usec))) {
-            return false;
-        }
-
-        $result = 0;
-        if (count($read)) {
-            $result |= NET_SOCKET_READ;
-        }
-        if (count($write)) {
-            $result |= NET_SOCKET_WRITE;
-        }
-        if (count($except)) {
-            $result |= NET_SOCKET_ERROR;
-        }
-        return $result;
-    }
-
-    /**
-     * Turns encryption on/off on a connected socket.
-     *
-     * @param bool    $enabled  Set this parameter to true to enable encryption
-     *                          and false to disable encryption.
-     * @param integer $type     Type of encryption. See
-     *                          http://se.php.net/manual/en/function.stream-socket-enable-crypto.php for values.
-     *
-     * @access public
-     * @return false on error, true on success and 0 if there isn't enough data and the
-     *         user should try again (non-blocking sockets only). A PEAR_Error object
-     *         is returned if the socket is not connected
-     */
-    public function enableCrypto($enabled, $type)
-    {
-        if (version_compare(phpversion(), "5.1.0", ">=")) {
-            if (!is_resource($this->fp)) {
-                return $this->raiseError('not connected');
-            }
-            return @stream_socket_enable_crypto($this->fp, $enabled, $type);
-        } else {
-            return $this->raiseError('Net_Socket::enableCrypto() requires php version >= 5.1.0');
-        }
-    }
+	/**
+	 * Socket file pointer.
+	 * @var resource $fp
+	 */
+	public $fp = null;
+
+	/**
+	 * Whether the socket is blocking. Defaults to true.
+	 * @var boolean $blocking
+	 */
+	public $blocking = true;
+
+	/**
+	 * Whether the socket is persistent. Defaults to false.
+	 * @var boolean $persistent
+	 */
+	public $persistent = false;
+
+	/**
+	 * The IP address to connect to.
+	 * @var string $addr
+	 */
+	public $addr = '';
+
+	/**
+	 * The port number to connect to.
+	 * @var integer $port
+	 */
+	public $port = 0;
+
+	/**
+	 * Number of seconds to wait on socket connections before assuming
+	 * there's no more data. Defaults to no timeout.
+	 * @var integer $timeout
+	 */
+	public $timeout = false;
+
+	/**
+	 * Number of bytes to read at a time in readLine() and
+	 * readAll(). Defaults to 2048.
+	 * @var integer $lineLength
+	 */
+	public $lineLength = 2048;
+
+	/**
+	 * Connect to the specified port. If called when the socket is
+	 * already connected, it disconnects and connects again.
+	 *
+	 * @param string  $addr        IP address or host name.
+	 * @param integer $port        TCP port number.
+	 * @param boolean $persistent  (optional) Whether the connection is
+	 *                             persistent (kept open between requests
+	 *                             by the web server).
+	 * @param integer $timeout     (optional) How long to wait for data.
+	 * @param array   $options     See options for stream_context_create.
+	 *
+	 * @access public
+	 *
+	 * @return boolean | PEAR_Error  True on success or a PEAR_Error on failure.
+	 */
+	public function connect($addr, $port = 0, $persistent = null, $timeout = null, $options = null)
+	{
+		if (is_resource($this->fp)) {
+			@fclose($this->fp);
+			$this->fp = null;
+		}
+
+		if (!$addr) {
+			return $this->raiseError('$addr cannot be empty');
+		} elseif (strspn($addr, '.0123456789') == strlen($addr) ||
+				  strstr($addr, '/') !== false) {
+			$this->addr = $addr;
+		} else {
+			$this->addr = @gethostbyname($addr);
+		}
+
+		$this->port = $port % 65536;
+
+		if ($persistent !== null) {
+			$this->persistent = $persistent;
+		}
+
+		if ($timeout !== null) {
+			$this->timeout = $timeout;
+		}
+
+		$openfunc = $this->persistent ? 'pfsockopen' : 'fsockopen';
+		$errno = 0;
+		$errstr = '';
+		$old_track_errors = @ini_set('track_errors', 1);
+		if ($options && function_exists('stream_context_create')) {
+			if ($this->timeout) {
+				$timeout = $this->timeout;
+			} else {
+				$timeout = 0;
+			}
+			$context = stream_context_create($options);
+
+			// Since PHP 5 fsockopen doesn't allow context specification
+			if (function_exists('stream_socket_client')) {
+				$flags = $this->persistent ? STREAM_CLIENT_PERSISTENT : STREAM_CLIENT_CONNECT;
+				$addr = $this->addr . ':' . $this->port;
+				$fp = stream_socket_client($addr, $errno, $errstr, $timeout, $flags, $context);
+			} else {
+				$fp = @$openfunc($this->addr, $this->port, $errno, $errstr, $timeout, $context);
+			}
+		} else {
+			if ($this->timeout) {
+				$fp = @$openfunc($this->addr, $this->port, $errno, $errstr, $this->timeout);
+			} else {
+				$fp = @$openfunc($this->addr, $this->port, $errno, $errstr);
+			}
+		}
+
+		if (!$fp) {
+			if ($errno == 0 && isset($php_errormsg)) {
+				$errstr = $php_errormsg;
+			}
+			@ini_set('track_errors', $old_track_errors);
+			return $this->raiseError($errstr, $errno);
+		}
+
+		@ini_set('track_errors', $old_track_errors);
+		$this->fp = $fp;
+
+		return $this->setBlocking($this->blocking);
+	}
+
+	/**
+	 * Disconnects from the peer, closes the socket.
+	 *
+	 * @access public
+	 * @return mixed true on success or a PEAR_Error instance otherwise
+	 */
+	public function disconnect()
+	{
+		if (!is_resource($this->fp)) {
+			return $this->raiseError('not connected');
+		}
+
+		@fclose($this->fp);
+		$this->fp = null;
+		return true;
+	}
+
+	/**
+	 * Find out if the socket is in blocking mode.
+	 *
+	 * @access public
+	 * @return boolean  The current blocking mode.
+	 */
+	public function isBlocking()
+	{
+		return $this->blocking;
+	}
+
+	/**
+	 * Sets whether the socket connection should be blocking or
+	 * not. A read call to a non-blocking socket will return immediately
+	 * if there is no data available, whereas it will block until there
+	 * is data for blocking sockets.
+	 *
+	 * @param boolean $mode  True for blocking sockets, false for nonblocking.
+	 * @access public
+	 * @return mixed true on success or a PEAR_Error instance otherwise
+	 */
+	public function setBlocking($mode)
+	{
+		if (!is_resource($this->fp)) {
+			return $this->raiseError('not connected');
+		}
+
+		$this->blocking = $mode;
+		socket_set_blocking($this->fp, $this->blocking);
+		return true;
+	}
+
+	/**
+	 * Sets the timeout value on socket descriptor,
+	 * expressed in the sum of seconds and microseconds
+	 *
+	 * @param integer $seconds  Seconds.
+	 * @param integer $microseconds  Microseconds.
+	 * @access public
+	 * @return mixed true on success or a PEAR_Error instance otherwise
+	 */
+	public function setTimeout($seconds, $microseconds)
+	{
+		if (!is_resource($this->fp)) {
+			return $this->raiseError('not connected');
+		}
+
+		return socket_set_timeout($this->fp, $seconds, $microseconds);
+	}
+
+	/**
+	 * Sets the file buffering size on the stream.
+	 * See php's stream_set_write_buffer for more information.
+	 *
+	 * @param integer $size     Write buffer size.
+	 * @access public
+	 * @return mixed on success or an PEAR_Error object otherwise
+	 */
+	public function setWriteBuffer($size)
+	{
+		if (!is_resource($this->fp)) {
+			return $this->raiseError('not connected');
+		}
+
+		$returned = stream_set_write_buffer($this->fp, $size);
+		if ($returned == 0) {
+			return true;
+		}
+		return $this->raiseError('Cannot set write buffer.');
+	}
+
+	/**
+	 * Returns information about an existing socket resource.
+	 * Currently returns four entries in the result array:
+	 *
+	 * <p>
+	 * timed_out (bool) - The socket timed out waiting for data<br>
+	 * blocked (bool) - The socket was blocked<br>
+	 * eof (bool) - Indicates EOF event<br>
+	 * unread_bytes (int) - Number of bytes left in the socket buffer<br>
+	 * </p>
+	 *
+	 * @access public
+	 * @return mixed Array containing information about existing socket resource or a PEAR_Error instance otherwise
+	 */
+	public function getStatus()
+	{
+		if (!is_resource($this->fp)) {
+			return $this->raiseError('not connected');
+		}
+
+		return socket_get_status($this->fp);
+	}
+
+	/**
+	 * Get a specified line of data
+	 *
+	 * @access public
+	 * @return $size bytes of data from the socket, or a PEAR_Error if
+	 *         not connected.
+	 */
+	public function gets($size)
+	{
+		if (!is_resource($this->fp)) {
+			return $this->raiseError('not connected');
+		}
+
+		return @fgets($this->fp, $size);
+	}
+
+	/**
+	 * Read a specified amount of data. This is guaranteed to return,
+	 * and has the added benefit of getting everything in one fread()
+	 * chunk; if you know the size of the data you're getting
+	 * beforehand, this is definitely the way to go.
+	 *
+	 * @param integer $size  The number of bytes to read from the socket.
+	 * @access public
+	 * @return $size bytes of data from the socket, or a PEAR_Error if
+	 *         not connected.
+	 */
+	public function read($size)
+	{
+		if (!is_resource($this->fp)) {
+			return $this->raiseError('not connected');
+		}
+
+		return @fread($this->fp, $size);
+	}
+
+	/**
+	 * Write a specified amount of data.
+	 *
+	 * @param string  $data       Data to write.
+	 * @param integer $blocksize  Amount of data to write at once.
+	 *                            NULL means all at once.
+	 *
+	 * @access public
+	 * @return mixed If the socket is not connected, returns an instance of PEAR_Error
+	 *               If the write succeeds, returns the number of bytes written
+	 *               If the write fails, returns false.
+	 */
+	public function write($data, $blocksize = null)
+	{
+		if (!is_resource($this->fp)) {
+			return $this->raiseError('not connected');
+		}
+
+		if (is_null($blocksize) && !OS_WINDOWS) {
+			return @fwrite($this->fp, $data);
+		} else {
+			if (is_null($blocksize)) {
+				$blocksize = 1024;
+			}
+
+			$pos = 0;
+			$size = strlen($data);
+			while ($pos < $size) {
+				$written = @fwrite($this->fp, substr($data, $pos, $blocksize));
+				if ($written === false) {
+					return false;
+				}
+				$pos += $written;
+			}
+
+			return $pos;
+		}
+	}
+
+	/**
+	 * Write a line of data to the socket, followed by a trailing "\r\n".
+	 *
+	 * @access public
+	 * @return mixed fputs result, or an error
+	 */
+	public function writeLine($data)
+	{
+		if (!is_resource($this->fp)) {
+			return $this->raiseError('not connected');
+		}
+
+		return fwrite($this->fp, $data . "\r\n");
+	}
+
+	/**
+	 * Tests for end-of-file on a socket descriptor.
+	 *
+	 * Also returns true if the socket is disconnected.
+	 *
+	 * @access public
+	 * @return bool
+	 */
+	public function eof()
+	{
+		return (!is_resource($this->fp) || feof($this->fp));
+	}
+
+	/**
+	 * Reads a byte of data
+	 *
+	 * @access public
+	 * @return 1 byte of data from the socket, or a PEAR_Error if
+	 *         not connected.
+	 */
+	public function readByte()
+	{
+		if (!is_resource($this->fp)) {
+			return $this->raiseError('not connected');
+		}
+
+		return ord(@fread($this->fp, 1));
+	}
+
+	/**
+	 * Reads a word of data
+	 *
+	 * @access public
+	 * @return 1 word of data from the socket, or a PEAR_Error if
+	 *         not connected.
+	 */
+	public function readWord()
+	{
+		if (!is_resource($this->fp)) {
+			return $this->raiseError('not connected');
+		}
+
+		$buf = @fread($this->fp, 2);
+		return (ord($buf[0]) + (ord($buf[1]) << 8));
+	}
+
+	/**
+	 * Reads an int of data
+	 *
+	 * @access public
+	 * @return integer  1 int of data from the socket, or a PEAR_Error if
+	 *                  not connected.
+	 */
+	public function readInt()
+	{
+		if (!is_resource($this->fp)) {
+			return $this->raiseError('not connected');
+		}
+
+		$buf = @fread($this->fp, 4);
+		return (ord($buf[0]) + (ord($buf[1]) << 8) +
+				(ord($buf[2]) << 16) + (ord($buf[3]) << 24));
+	}
+
+	/**
+	 * Reads a zero-terminated string of data
+	 *
+	 * @access public
+	 * @return string, or a PEAR_Error if
+	 *         not connected.
+	 */
+	public function readString()
+	{
+		if (!is_resource($this->fp)) {
+			return $this->raiseError('not connected');
+		}
+
+		$string = '';
+		while (($char = @fread($this->fp, 1)) != "\x00")  {
+			$string .= $char;
+		}
+		return $string;
+	}
+
+	/**
+	 * Reads an IP Address and returns it in a dot formatted string
+	 *
+	 * @access public
+	 * @return Dot formatted string, or a PEAR_Error if
+	 *         not connected.
+	 */
+	public function readIPAddress()
+	{
+		if (!is_resource($this->fp)) {
+			return $this->raiseError('not connected');
+		}
+
+		$buf = @fread($this->fp, 4);
+		return sprintf('%d.%d.%d.%d', ord($buf[0]), ord($buf[1]),
+					   ord($buf[2]), ord($buf[3]));
+	}
+
+	/**
+	 * Read until either the end of the socket or a newline, whichever
+	 * comes first. Strips the trailing newline from the returned data.
+	 *
+	 * @access public
+	 * @return All available data up to a newline, without that
+	 *         newline, or until the end of the socket, or a PEAR_Error if
+	 *         not connected.
+	 */
+	public function readLine()
+	{
+		if (!is_resource($this->fp)) {
+			return $this->raiseError('not connected');
+		}
+
+		$line = '';
+		$timeout = time() + $this->timeout;
+		while (!feof($this->fp) && (!$this->timeout || time() < $timeout)) {
+			$line .= @fgets($this->fp, $this->lineLength);
+			if (substr($line, -1) == "\n") {
+				return rtrim($line, "\r\n");
+			}
+		}
+		return $line;
+	}
+
+	/**
+	 * Read until the socket closes, or until there is no more data in
+	 * the inner PHP buffer. If the inner buffer is empty, in blocking
+	 * mode we wait for at least 1 byte of data. Therefore, in
+	 * blocking mode, if there is no data at all to be read, this
+	 * function will never exit (unless the socket is closed on the
+	 * remote end).
+	 *
+	 * @access public
+	 *
+	 * @return string  All data until the socket closes, or a PEAR_Error if
+	 *                 not connected.
+	 */
+	public function readAll()
+	{
+		if (!is_resource($this->fp)) {
+			return $this->raiseError('not connected');
+		}
+
+		$data = '';
+		while (!feof($this->fp)) {
+			$data .= @fread($this->fp, $this->lineLength);
+		}
+		return $data;
+	}
+
+	/**
+	 * Runs the equivalent of the select() system call on the socket
+	 * with a timeout specified by tv_sec and tv_usec.
+	 *
+	 * @param integer $state    Which of read/write/error to check for.
+	 * @param integer $tv_sec   Number of seconds for timeout.
+	 * @param integer $tv_usec  Number of microseconds for timeout.
+	 *
+	 * @access public
+	 * @return False if select fails, integer describing which of read/write/error
+	 *         are ready, or PEAR_Error if not connected.
+	 */
+	public function select($state, $tv_sec, $tv_usec = 0)
+	{
+		if (!is_resource($this->fp)) {
+			return $this->raiseError('not connected');
+		}
+
+		$read = null;
+		$write = null;
+		$except = null;
+		if ($state & NET_SOCKET_READ) {
+			$read[] = $this->fp;
+		}
+		if ($state & NET_SOCKET_WRITE) {
+			$write[] = $this->fp;
+		}
+		if ($state & NET_SOCKET_ERROR) {
+			$except[] = $this->fp;
+		}
+		if (false === ($sr = stream_select($read, $write, $except, $tv_sec, $tv_usec))) {
+			return false;
+		}
+
+		$result = 0;
+		if (count($read)) {
+			$result |= NET_SOCKET_READ;
+		}
+		if (count($write)) {
+			$result |= NET_SOCKET_WRITE;
+		}
+		if (count($except)) {
+			$result |= NET_SOCKET_ERROR;
+		}
+		return $result;
+	}
+
+	/**
+	 * Turns encryption on/off on a connected socket.
+	 *
+	 * @param bool    $enabled  Set this parameter to true to enable encryption
+	 *                          and false to disable encryption.
+	 * @param integer $type     Type of encryption. See
+	 *                          http://se.php.net/manual/en/function.stream-socket-enable-crypto.php for values.
+	 *
+	 * @access public
+	 * @return false on error, true on success and 0 if there isn't enough data and the
+	 *         user should try again (non-blocking sockets only). A PEAR_Error object
+	 *         is returned if the socket is not connected
+	 */
+	public function enableCrypto($enabled, $type)
+	{
+		if (version_compare(phpversion(), "5.1.0", ">=")) {
+			if (!is_resource($this->fp)) {
+				return $this->raiseError('not connected');
+			}
+			return @stream_socket_enable_crypto($this->fp, $enabled, $type);
+		} else {
+			return $this->raiseError('Net_Socket::enableCrypto() requires php version >= 5.1.0');
+		}
+	}
 
 }