YetiForceCompany / YetiForceCRM

libraries/nusoap/class.soap_server.php

Doc Comments +1 added lines, -1 removed lines

@@ -839,7 +839,7 @@
 	 *
 	 * @param	array	$headers	The HTTP headers
 	 * @param	string	$data		unprocessed request data from client
-	 * @return	mixed	value of the message, decoded into a PHP type
+	 * @return	false|null	value of the message, decoded into a PHP type
 	 * @access   private
 	 */
 	public function parseRequest($headers, $data)

Spacing +1 added lines, -1 removed lines

@@ -619,7 +619,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)) {

libraries/nusoap/class.soap_transport_http.php

Doc Comments +5 added lines, -5 removed lines

@@ -169,10 +169,6 @@ 
 	/**
 	* establish an HTTP connection
 	*
-	* @param    integer $timeout set connection timeout in seconds
-	* @param	integer $response_timeout set response timeout in seconds
-	* @return	boolean true if connected, false if not
-	* @access   private
 	*/
 	public function connect($connection_timeout=0,$response_timeout=30){
 	  	// For PHP 4.3 with OpenSSL, change https scheme to ssl, then treat like
@@ -729,7 +725,7 @@ 
 	*
 	* @param    string $data message data
 	* @param	array $cookies cookies to send
-	* @return	boolean	true if OK, false if problem
+	* @return	boolean|null	true if OK, false if problem
 	* @access   private
 	*/
 	public function sendRequest($data, $cookies = NULL) {
@@ -1194,6 +1190,10 @@ 
 	/*
 	 * TODO: allow a Set-Cookie string to be parsed into multiple cookies
 	 */
+
+	/**
+	 * @param string $cookie_str
+	 */
 	public function parseCookie($cookie_str) {
 		$cookie_str = str_replace('; ', ';', $cookie_str) . ';';
 		$data = preg_split('/;/', $cookie_str);

Indentation +153 added lines, -153 removed lines

@@ -50,13 +50,13 @@ 
 								// verifyhost: default is 1
 
 	/**
-	* constructor
-	*
-	* @param string $url The URL to which to connect
-	* @param array $curl_options User-specified cURL options
-	* @param boolean $use_curl Whether to try to force cURL use
-	* @access public
-	*/
+	 * constructor
+	 *
+	 * @param string $url The URL to which to connect
+	 * @param array $curl_options User-specified cURL options
+	 * @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){
 		parent::nusoap_base();
 		$this->debug("ctor url=$url use_curl=$use_curl curl_options:");
@@ -71,12 +71,12 @@ 
 	}
 
 	/**
-	* sets a cURL option
-	*
-	* @param	mixed $option The cURL option (always integer?)
-	* @param	mixed $value The cURL option value
-	* @access   private
-	*/
+	 * sets a cURL option
+	 *
+	 * @param	mixed $option The cURL option (always integer?)
+	 * @param	mixed $value The cURL option value
+	 * @access   private
+	 */
 	public function setCurlOption($option, $value) {
 		$this->debug("setCurlOption option=$option, value=");
 		$this->appendDebug($this->varDump($value));
@@ -84,23 +84,23 @@ 
 	}
 
 	/**
-	* sets an HTTP header
-	*
-	* @param string $name The name of the header
-	* @param string $value The value of the header
-	* @access private
-	*/
+	 * sets an HTTP header
+	 *
+	 * @param string $name The name of the header
+	 * @param string $value The value of the header
+	 * @access private
+	 */
 	public function setHeader($name, $value) {
 		$this->outgoing_headers[$name] = $value;
 		$this->debug("set header $name: $value");
 	}
 
 	/**
-	* unsets an HTTP header
-	*
-	* @param string $name The name of the header
-	* @access private
-	*/
+	 * unsets an HTTP header
+	 *
+	 * @param string $name The name of the header
+	 * @access private
+	 */
 	public function unsetHeader($name) {
 		if (isset($this->outgoing_headers[$name])) {
 			$this->debug("unset header $name");
@@ -109,11 +109,11 @@ 
 	}
 
 	/**
-	* sets the URL to which to connect
-	*
-	* @param string $url The URL to which to connect
-	* @access private
-	*/
+	 * sets the URL to which to connect
+	 *
+	 * @param string $url The URL to which to connect
+	 * @access private
+	 */
 	public function setURL($url) {
 		$this->url = $url;
 
@@ -125,7 +125,7 @@ 
 		
 		// add any GET params to path
 		if(isset($u['query']) && $u['query'] != ''){
-            $this->path .= '?' . $u['query'];
+			$this->path .= '?' . $u['query'];
 		}
 		
 		// set default port
@@ -153,11 +153,11 @@ 
 	}
 
 	/**
-	* gets the I/O method to use
-	*
-	* @return	string	I/O method to use (socket|curl|unknown)
-	* @access	private
-	*/
+	 * gets the I/O method to use
+	 *
+	 * @return	string	I/O method to use (socket|curl|unknown)
+	 * @access	private
+	 */
 	public function io_method() {
 		if ($this->use_curl || ($this->scheme == 'https') || ($this->scheme == 'http' && $this->authtype == 'ntlm') || ($this->scheme == 'http' && is_array($this->proxy) && $this->proxy['authtype'] == 'ntlm'))
 			return 'curl';
@@ -167,13 +167,13 @@ 
 	}
 
 	/**
-	* establish an HTTP connection
-	*
-	* @param    integer $timeout set connection timeout in seconds
-	* @param	integer $response_timeout set response timeout in seconds
-	* @return	boolean true if connected, false if not
-	* @access   private
-	*/
+	 * establish an HTTP connection
+	 *
+	 * @param    integer $timeout set connection timeout in seconds
+	 * @param	integer $response_timeout set response timeout in seconds
+	 * @return	boolean true if connected, false if not
+	 * @access   private
+	 */
 	public function connect($connection_timeout=0,$response_timeout=30){
 	  	// For PHP 4.3 with OpenSSL, change https scheme to ssl, then treat like
 	  	// "regular" socket.
@@ -399,15 +399,15 @@ 
 	}
 
 	/**
-	* sends the SOAP request and gets the SOAP response via HTTP[S]
-	*
-	* @param    string $data message data
-	* @param    integer $timeout set connection timeout in seconds
-	* @param	integer $response_timeout set response timeout in seconds
-	* @param	array $cookies cookies to send
-	* @return	string data
-	* @access   public
-	*/
+	 * sends the SOAP request and gets the SOAP response via HTTP[S]
+	 *
+	 * @param    string $data message data
+	 * @param    integer $timeout set connection timeout in seconds
+	 * @param	integer $response_timeout set response timeout in seconds
+	 * @param	array $cookies cookies to send
+	 * @return	string data
+	 * @access   public
+	 */
 	public function send($data, $timeout=0, $response_timeout=30, $cookies=NULL) {
 		
 		$this->debug('entered send() with data of length: '.strlen($data));
@@ -439,30 +439,30 @@ 
 
 
 	/**
-	* sends the SOAP request and gets the SOAP response via HTTPS using CURL
-	*
-	* @param    string $data message data
-	* @param    integer $timeout set connection timeout in seconds
-	* @param	integer $response_timeout set response timeout in seconds
-	* @param	array $cookies cookies to send
-	* @return	string data
-	* @access   public
-	* @deprecated
-	*/
+	 * sends the SOAP request and gets the SOAP response via HTTPS using CURL
+	 *
+	 * @param    string $data message data
+	 * @param    integer $timeout set connection timeout in seconds
+	 * @param	integer $response_timeout set response timeout in seconds
+	 * @param	array $cookies cookies to send
+	 * @return	string data
+	 * @access   public
+	 * @deprecated
+	 */
 	public function sendHTTPS($data, $timeout=0, $response_timeout=30, $cookies) {
 		return $this->send($data, $timeout, $response_timeout, $cookies);
 	}
 	
 	/**
-	* if authenticating, set user credentials here
-	*
-	* @param    string $username
-	* @param    string $password
-	* @param	string $authtype (basic|digest|certificate|ntlm)
-	* @param	array $digestRequest (keys must be nonce, nc, realm, qop)
-	* @param	array $certRequest (keys must be cainfofile (optional), sslcertfile, sslkeyfile, passphrase, certpassword (optional), verifypeer (optional), verifyhost (optional): see corresponding options in cURL docs)
-	* @access   public
-	*/
+	 * if authenticating, set user credentials here
+	 *
+	 * @param    string $username
+	 * @param    string $password
+	 * @param	string $authtype (basic|digest|certificate|ntlm)
+	 * @param	array $digestRequest (keys must be nonce, nc, realm, qop)
+	 * @param	array $certRequest (keys must be cainfofile (optional), sslcertfile, sslkeyfile, passphrase, certpassword (optional), verifypeer (optional), verifyhost (optional): see corresponding options in cURL docs)
+	 * @access   public
+	 */
 	public function setCredentials($username, $password, $authtype = 'basic', $digestRequest = array(), $certRequest = array()) {
 		$this->debug("setCredentials username=$username authtype=$authtype digestRequest=");
 		$this->appendDebug($this->varDump($digestRequest));
@@ -532,21 +532,21 @@ 
 	}
 	
 	/**
-	* set the soapaction value
-	*
-	* @param    string $soapaction
-	* @access   public
-	*/
+	 * set the soapaction value
+	 *
+	 * @param    string $soapaction
+	 * @access   public
+	 */
 	public function setSOAPAction($soapaction) {
 		$this->setHeader('SOAPAction', '"' . $soapaction . '"');
 	}
 	
 	/**
-	* use http encoding
-	*
-	* @param    string $enc encoding style. supported values: gzip, deflate, or both
-	* @access   public
-	*/
+	 * use http encoding
+	 *
+	 * @param    string $enc encoding style. supported values: gzip, deflate, or both
+	 * @access   public
+	 */
 	public function setEncoding($enc='gzip, deflate') {
 		if (function_exists('gzdeflate')) {
 			$this->protocol_version = '1.1';
@@ -562,15 +562,15 @@ 
 	}
 	
 	/**
-	* set proxy info here
-	*
-	* @param    string $proxyhost use an empty string to remove proxy
-	* @param    string $proxyport
-	* @param	string $proxyusername
-	* @param	string $proxypassword
-	* @param	string $proxyauthtype (basic|ntlm)
-	* @access   public
-	*/
+	 * set proxy info here
+	 *
+	 * @param    string $proxyhost use an empty string to remove proxy
+	 * @param    string $proxyport
+	 * @param	string $proxyusername
+	 * @param	string $proxypassword
+	 * @param	string $proxyauthtype (basic|ntlm)
+	 * @access   public
+	 */
 	public function setProxy($proxyhost, $proxyport, $proxyusername = '', $proxypassword = '', $proxyauthtype = 'basic') {
 		if ($proxyhost) {
 			$this->proxy = array(
@@ -617,15 +617,15 @@ 
 	}
 
 	/**
-	* decode a string that is encoded w/ "chunked' transfer encoding
- 	* as defined in RFC2068 19.4.6
-	*
-	* @param    string $buffer
-	* @param    string $lb
-	* @returns	string
-	* @access   public
-	* @deprecated
-	*/
+	 * decode a string that is encoded w/ "chunked' transfer encoding
+	 * as defined in RFC2068 19.4.6
+	 *
+	 * @param    string $buffer
+	 * @param    string $lb
+	 * @returns	string
+	 * @access   public
+	 * @deprecated
+	 */
 	public function decodeChunked($buffer, $lb){
 		// length := 0
 		$length = 0;
@@ -648,11 +648,11 @@ 
 		  	
 			// 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);
-		  	    break;
+				$new .= $chunk;
+		  		$length += strlen($chunk);
+		  		break;
 			}
 			
 		  	// read chunk-data and CRLF
@@ -725,13 +725,13 @@ 
 	}
 
 	/**
-	* sends the SOAP request via HTTP[S]
-	*
-	* @param    string $data message data
-	* @param	array $cookies cookies to send
-	* @return	boolean	true if OK, false if problem
-	* @access   private
-	*/
+	 * sends the SOAP request via HTTP[S]
+	 *
+	 * @param    string $data message data
+	 * @param	array $cookies cookies to send
+	 * @return	boolean	true if OK, false if problem
+	 * @access   private
+	 */
 	public function sendRequest($data, $cookies = NULL) {
 		// build cookie string
 		$cookie_str = $this->getCookiesForRequest($cookies, (($this->scheme == 'ssl') || ($this->scheme == 'https')));
@@ -783,18 +783,18 @@ 
 	}
 
 	/**
-	* gets the SOAP response via HTTP[S]
-	*
-	* @return	string the response (also sets member variables like incoming_payload)
-	* @access   private
-	*/
+	 * gets the SOAP response via HTTP[S]
+	 *
+	 * @return	string the response (also sets member variables like incoming_payload)
+	 * @access   private
+	 */
 	public function getResponse(){
 		$this->incoming_payload = '';
 	    
 	  if ($this->io_method() == 'socket') {
-	    // loop until headers have been retrieved
-	    $data = '';
-	    while (!isset($lb)){
+		// loop until headers have been retrieved
+		$data = '';
+		while (!isset($lb)){
 
 			// We might EOF during header read.
 			if(feof($this->fp)) {
@@ -855,7 +855,7 @@ 
 					} else {
 						$this->debug('did not find cookie in ' . trim($arr[1]));
 					}
-    			}
+				}
 			} else if (isset($header_name)) {
 				// append continuation line to previous header
 				$this->incoming_headers[$header_name] .= $lb . ' ' . $header_line;
@@ -893,8 +893,8 @@ 
 				$this->debug("chunk length $content_length");
 			}
 			$strlen = 0;
-		    while (($strlen < $content_length) && (!feof($this->fp))) {
-		    	$readlen = min(8192, $content_length - $strlen);
+			while (($strlen < $content_length) && (!feof($this->fp))) {
+				$readlen = min(8192, $content_length - $strlen);
 				$tmp = fread($this->fp, $readlen);
 				$tmplen = strlen($tmp);
 				$this->debug("read buffer of $tmplen bytes");
@@ -960,17 +960,17 @@ 
 		$this->incoming_payload = curl_exec($this->ch);
 		$data = $this->incoming_payload;
 
-        $cErr = curl_error($this->ch);
+		$cErr = curl_error($this->ch);
 		if ($cErr != '') {
-        	$err = 'cURL ERROR: '.curl_errno($this->ch).': '.$cErr.'<br>';
-        	// TODO: there is a PHP bug that can cause this to SEGV for CURLINFO_CONTENT_TYPE
+			$err = 'cURL ERROR: '.curl_errno($this->ch).': '.$cErr.'<br>';
+			// TODO: there is a PHP bug that can cause this to SEGV for CURLINFO_CONTENT_TYPE
 			foreach(curl_getinfo($this->ch) as $k => $v){
 				$err .= "$k: $v<br>";
 			}
 			$this->debug($err);
 			$this->setError($err);
 			curl_close($this->ch);
-	    	return false;
+			return false;
 		} else {
 			//echo '<pre>';
 			//var_dump(curl_getinfo($this->ch));
@@ -1033,7 +1033,7 @@ 
 					} else {
 						$this->debug('did not find cookie in ' . trim($arr[1]));
 					}
-    			}
+				}
 			} else if (isset($header_name)) {
 				// append continuation line to previous header
 				$this->incoming_headers[$header_name] .= $lb . ' ' . $header_line;
@@ -1094,49 +1094,49 @@ 
 		// 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 decoding works, use it. else assume data wasn't gzencoded
-    			if(function_exists('gzinflate')){
+				// if decoding works, use it. else assume data wasn't gzencoded
+				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');
 					$datalen = strlen($data);
 					if ($this->incoming_headers['content-encoding'] == 'deflate') {
 						if ($degzdata = @gzinflate($data)) {
-	    					$data = $degzdata;
-	    					$this->debug('The payload has been inflated to ' . strlen($data) . ' bytes');
-	    					if (strlen($data) < $datalen) {
-	    						// test for the case that the payload has been compressed twice
-		    					$this->debug('The inflated payload is smaller than the gzipped one; try again');
+							$data = $degzdata;
+							$this->debug('The payload has been inflated to ' . strlen($data) . ' bytes');
+							if (strlen($data) < $datalen) {
+								// test for the case that the payload has been compressed twice
+								$this->debug('The inflated payload is smaller than the gzipped one; try again');
 								if ($degzdata = @gzinflate($data)) {
-			    					$data = $degzdata;
-			    					$this->debug('The payload has been inflated again to ' . strlen($data) . ' bytes');
+									$data = $degzdata;
+									$this->debug('The payload has been inflated again to ' . strlen($data) . ' bytes');
 								}
-	    					}
-	    				} else {
-	    					$this->debug('Error using gzinflate to inflate the payload');
-	    					$this->setError('Error using gzinflate to inflate the payload');
-	    				}
+							}
+						} else {
+							$this->debug('Error using gzinflate to inflate the payload');
+							$this->setError('Error using gzinflate to inflate the payload');
+						}
 					} elseif ($this->incoming_headers['content-encoding'] == 'gzip') {
 						if ($degzdata = @gzinflate(substr($data, 10))) {	// do our best
 							$data = $degzdata;
-	    					$this->debug('The payload has been un-gzipped to ' . strlen($data) . ' bytes');
-	    					if (strlen($data) < $datalen) {
-	    						// test for the case that the payload has been compressed twice
-		    					$this->debug('The un-gzipped payload is smaller than the gzipped one; try again');
+							$this->debug('The payload has been un-gzipped to ' . strlen($data) . ' bytes');
+							if (strlen($data) < $datalen) {
+								// test for the case that the payload has been compressed twice
+								$this->debug('The un-gzipped payload is smaller than the gzipped one; try again');
 								if ($degzdata = @gzinflate(substr($data, 10))) {
-			    					$data = $degzdata;
-			    					$this->debug('The payload has been un-gzipped again to ' . strlen($data) . ' bytes');
+									$data = $degzdata;
+									$this->debug('The payload has been un-gzipped again to ' . strlen($data) . ' bytes');
 								}
-	    					}
-	    				} else {
-	    					$this->debug('Error using gzinflate to un-gzip the payload');
+							}
+						} else {
+							$this->debug('Error using gzinflate to un-gzip the payload');
 							$this->setError('Error using gzinflate to un-gzip the payload');
-	    				}
+						}
 					}
 					//print "<xmp>\nde-inflated:\n---------------\n$data\n-------------\n</xmp>";
 					// set decoded payload
 					$this->incoming_payload = $header_data.$lb.$lb.$data;
-    			} else {
+				} 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.');
 				}
@@ -1239,7 +1239,7 @@ 
 			$name = substr($value_str, 0, $sep_pos);
 			$value = substr($value_str, $sep_pos + 1);
 			$cookie= array(	'name' => $name,
-			                'value' => $value,
+							'value' => $value,
 							'domain' => $domain,
 							'path' => $path,
 							'expires' => $expires,
@@ -1265,7 +1265,7 @@ 
 				if (! is_array($cookie)) {
 					continue;
 				}
-	    		$this->debug("check cookie for validity: ".$cookie['name'].'='.$cookie['value']);
+				$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');
@@ -1291,7 +1291,7 @@ 
 					continue;
 				}
 				$cookie_str .= $cookie['name'] . '=' . $cookie['value'] . '; ';
-	    		$this->debug('add cookie to Cookie-String: ' . $cookie['name'] . '=' . $cookie['value']);
+				$this->debug('add cookie to Cookie-String: ' . $cookie['name'] . '=' . $cookie['value']);
 			}
 		}
 		return $cookie_str;

Spacing +103 added lines, -103 removed lines

@@ -29,18 +29,18 @@ 
 	var $incoming_cookies = array();
 	var $outgoing_payload = '';
 	var $incoming_payload = '';
-	var $response_status_line;	// HTTP response status line
+	var $response_status_line; // HTTP response status line
 	var $useSOAPAction = true;
 	var $persistentConnection = false;
-	var $ch = false;	// cURL handle
-	var $ch_options = array();	// cURL custom options
-	var $use_curl = false;		// force cURL use
-	var $proxy = null;			// proxy information (associative array)
+	var $ch = false; // cURL handle
+	var $ch_options = array(); // cURL custom options
+	var $use_curl = false; // force cURL use
+	var $proxy = null; // proxy information (associative array)
 	var $username = '';
 	var $password = '';
 	var $authtype = '';
 	var $digestRequest = array();
-	var $certRequest = array();	// keys must be cainfofile (optional), sslcertfile, sslkeyfile, passphrase, certpassword (optional), verifypeer (optional), verifyhost (optional)
+	var $certRequest = array(); // keys must be cainfofile (optional), sslcertfile, sslkeyfile, passphrase, certpassword (optional), verifypeer (optional), verifyhost (optional)
 								// cainfofile: certificate authority file, e.g. '$pathToPemFiles/rootca.pem'
 								// sslcertfile: SSL certificate file, e.g. '$pathToPemFiles/mycert.pem'
 								// sslkeyfile: SSL key file, e.g. '$pathToPemFiles/mykey.pem'
@@ -57,7 +57,7 @@ 
 	* @param boolean $use_curl Whether to try to force cURL use
 	* @access public
 	*/
-	public function soap_transport_http($url, $curl_options = NULL, $use_curl = false){
+	public function soap_transport_http($url, $curl_options = NULL, $use_curl = false) {
 		parent::nusoap_base();
 		$this->debug("ctor url=$url use_curl=$use_curl curl_options:");
 		$this->appendDebug($this->varDump($curl_options));
@@ -67,7 +67,7 @@ 
 		}
 		$this->use_curl = $use_curl;
 		preg_match('/\$Revisio' . 'n: ([^ ]+)/', $this->revision, $rev);
-		$this->setHeader('User-Agent', $this->title.'/'.$this->version.' ('.$rev[1].')');
+		$this->setHeader('User-Agent', $this->title . '/' . $this->version . ' (' . $rev[1] . ')');
 	}
 
 	/**
@@ -118,19 +118,19 @@ 
 		$this->url = $url;
 
 		$u = parse_url($url);
-		foreach($u as $k => $v){
+		foreach ($u as $k => $v) {
 			$this->debug("parsed URL $k = $v");
 			$this->$k = $v;
 		}
 		
 		// add any GET params to path
-		if(isset($u['query']) && $u['query'] != ''){
+		if (isset($u['query']) && $u['query'] != '') {
             $this->path .= '?' . $u['query'];
 		}
 		
 		// set default port
-		if(!isset($u['port'])){
-			if($u['scheme'] == 'https'){
+		if (!isset($u['port'])) {
+			if ($u['scheme'] == 'https') {
 				$this->port = 443;
 			} else {
 				$this->port = 80;
@@ -144,7 +144,7 @@ 
 		if (!isset($u['port'])) {
 			$this->setHeader('Host', $this->host);
 		} else {
-			$this->setHeader('Host', $this->host.':'.$this->port);
+			$this->setHeader('Host', $this->host . ':' . $this->port);
 		}
 
 		if (isset($u['user']) && $u['user'] != '') {
@@ -174,7 +174,7 @@ 
 	* @return	boolean true if connected, false if not
 	* @access   private
 	*/
-	public function connect($connection_timeout=0,$response_timeout=30){
+	public function connect($connection_timeout = 0, $response_timeout = 30) {
 	  	// For PHP 4.3 with OpenSSL, change https scheme to ssl, then treat like
 	  	// "regular" socket.
 	  	// TODO: disabled for now because OpenSSL must be *compiled* in (not just
@@ -198,7 +198,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;
@@ -214,17 +214,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.';
 			}
@@ -235,7 +235,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;
@@ -374,13 +374,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);
 				}
@@ -408,9 +408,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;
@@ -418,12 +418,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;
 				}
 				
@@ -449,7 +449,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);
 	}
 	
@@ -470,7 +470,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;
@@ -478,7 +478,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);
@@ -487,7 +487,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:
@@ -547,7 +547,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);
@@ -581,7 +581,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');
@@ -600,7 +600,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',
@@ -626,7 +626,7 @@ 
 	* @access   public
 	* @deprecated
 	*/
-	public function decodeChunked($buffer, $lb){
+	public function decodeChunked($buffer, $lb) {
 		// length := 0
 		$length = 0;
 		$new = '';
@@ -638,17 +638,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);
@@ -656,7 +656,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
@@ -668,8 +668,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;
@@ -704,15 +704,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";
 		}
@@ -741,7 +741,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;
@@ -754,7 +754,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 {
@@ -788,16 +788,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);
@@ -818,17 +818,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 = '';
 			}//
@@ -837,13 +837,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') {
@@ -864,7 +864,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'])) {
@@ -872,7 +872,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");
 		}
@@ -926,19 +926,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;
 		}
@@ -962,9 +962,9 @@ 
 
         $cErr = curl_error($this->ch);
 		if ($cErr != '') {
-        	$err = 'cURL ERROR: '.curl_errno($this->ch).': '.$cErr.'<br>';
+        	$err = 'cURL ERROR: ' . curl_errno($this->ch) . ': ' . $cErr . '<br>';
         	// TODO: there is a PHP bug that can cause this to SEGV for CURLINFO_CONTENT_TYPE
-			foreach(curl_getinfo($this->ch) as $k => $v){
+			foreach (curl_getinfo($this->ch) as $k => $v) {
 				$err .= "$k: $v<br>";
 			}
 			$this->debug($err);
@@ -984,44 +984,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') {
@@ -1092,10 +1092,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');
@@ -1135,7 +1135,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.');
@@ -1148,7 +1148,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;
@@ -1174,7 +1174,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;
 		}
@@ -1219,7 +1219,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 {
@@ -1238,7 +1238,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,
@@ -1258,35 +1258,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;
 				}

Braces +39 added lines, -29 removed lines

@@ -159,10 +159,12 @@ 
 	* @access	private
 	*/
 	public function io_method() {
-		if ($this->use_curl || ($this->scheme == 'https') || ($this->scheme == 'http' && $this->authtype == 'ntlm') || ($this->scheme == 'http' && is_array($this->proxy) && $this->proxy['authtype'] == 'ntlm'))
-			return 'curl';
-		if (($this->scheme == 'http' || $this->scheme == 'ssl') && $this->authtype != 'ntlm' && (!is_array($this->proxy) || $this->proxy['authtype'] != 'ntlm'))
-			return 'socket';
+		if ($this->use_curl || ($this->scheme == 'https') || ($this->scheme == 'http' && $this->authtype == 'ntlm') || ($this->scheme == 'http' && is_array($this->proxy) && $this->proxy['authtype'] == 'ntlm')) {
+					return 'curl';
+		}
+		if (($this->scheme == 'http' || $this->scheme == 'ssl') && $this->authtype != 'ntlm' && (!is_array($this->proxy) || $this->proxy['authtype'] != 'ntlm')) {
+					return 'socket';
+		}
 		return 'unknown';
 	}
 
@@ -246,30 +248,36 @@ 
 			return false;
 		}
 		// Avoid warnings when PHP does not have these options
-		if (defined('CURLOPT_CONNECTIONTIMEOUT'))
-			$CURLOPT_CONNECTIONTIMEOUT = CURLOPT_CONNECTIONTIMEOUT;
-		else
-			$CURLOPT_CONNECTIONTIMEOUT = 78;
-		if (defined('CURLOPT_HTTPAUTH'))
-			$CURLOPT_HTTPAUTH = CURLOPT_HTTPAUTH;
-		else
-			$CURLOPT_HTTPAUTH = 107;
-		if (defined('CURLOPT_PROXYAUTH'))
-			$CURLOPT_PROXYAUTH = CURLOPT_PROXYAUTH;
-		else
-			$CURLOPT_PROXYAUTH = 111;
-		if (defined('CURLAUTH_BASIC'))
-			$CURLAUTH_BASIC = CURLAUTH_BASIC;
-		else
-			$CURLAUTH_BASIC = 1;
-		if (defined('CURLAUTH_DIGEST'))
-			$CURLAUTH_DIGEST = CURLAUTH_DIGEST;
-		else
-			$CURLAUTH_DIGEST = 2;
-		if (defined('CURLAUTH_NTLM'))
-			$CURLAUTH_NTLM = CURLAUTH_NTLM;
-		else
-			$CURLAUTH_NTLM = 8;
+		if (defined('CURLOPT_CONNECTIONTIMEOUT')) {
+					$CURLOPT_CONNECTIONTIMEOUT = CURLOPT_CONNECTIONTIMEOUT;
+		} else {
+					$CURLOPT_CONNECTIONTIMEOUT = 78;
+		}
+		if (defined('CURLOPT_HTTPAUTH')) {
+					$CURLOPT_HTTPAUTH = CURLOPT_HTTPAUTH;
+		} else {
+					$CURLOPT_HTTPAUTH = 107;
+		}
+		if (defined('CURLOPT_PROXYAUTH')) {
+					$CURLOPT_PROXYAUTH = CURLOPT_PROXYAUTH;
+		} else {
+					$CURLOPT_PROXYAUTH = 111;
+		}
+		if (defined('CURLAUTH_BASIC')) {
+					$CURLAUTH_BASIC = CURLAUTH_BASIC;
+		} else {
+					$CURLAUTH_BASIC = 1;
+		}
+		if (defined('CURLAUTH_DIGEST')) {
+					$CURLAUTH_DIGEST = CURLAUTH_DIGEST;
+		} else {
+					$CURLAUTH_DIGEST = 2;
+		}
+		if (defined('CURLAUTH_NTLM')) {
+					$CURLAUTH_NTLM = CURLAUTH_NTLM;
+		} else {
+					$CURLAUTH_NTLM = 8;
+		}
 
 		$this->debug('connect using cURL');
 		// init CURL
@@ -610,7 +618,9 @@ 
 								'HTTP/1.0 200 Connection established');
 		foreach ($skipHeaders as $hd) {
 			$prefix = substr($data, 0, strlen($hd));
-			if ($prefix == $hd) return true;
+			if ($prefix == $hd) {
+				return true;
+			}
 		}
 
 		return false;

libraries/nusoap/class.soap_val.php

Doc Comments +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
 	*
 	* @param    string $name optional name
 	* @param    mixed $type optional type name
-	* @param	mixed $value optional value
+	* @param	integer $value optional value
 	* @param	mixed $element_ns optional namespace of value
 	* @param	mixed $type_ns optional namespace of type
 	* @param	mixed $attributes associative array of attributes to add to element serialization

Indentation +23 added lines, -23 removed lines

@@ -59,16 +59,16 @@ 
 	var $attributes;
 
 	/**
-	* constructor
-	*
-	* @param    string $name optional name
-	* @param    mixed $type optional type name
-	* @param	mixed $value optional value
-	* @param	mixed $element_ns optional namespace of value
-	* @param	mixed $type_ns optional namespace of type
-	* @param	mixed $attributes associative array of attributes to add to element serialization
-	* @access   public
-	*/
+	 * constructor
+	 *
+	 * @param    string $name optional name
+	 * @param    mixed $type optional type name
+	 * @param	mixed $value optional value
+	 * @param	mixed $element_ns optional namespace of value
+	 * @param	mixed $type_ns optional namespace of type
+	 * @param	mixed $attributes associative array of attributes to add to element serialization
+	 * @access   public
+	 */
   	public function soapval($name='soapval',$type=false,$value=-1,$element_ns=false,$type_ns=false,$attributes=false) {
 		parent::nusoap_base();
 		$this->name = $name;
@@ -77,25 +77,25 @@ 
 		$this->element_ns = $element_ns;
 		$this->type_ns = $type_ns;
 		$this->attributes = $attributes;
-    }
+	}
 
 	/**
-	* return serialized value
-	*
-	* @param	string $use The WSDL use value (encoded|literal)
-	* @return	string XML data
-	* @access   public
-	*/
+	 * return serialized value
+	 *
+	 * @param	string $use The WSDL use value (encoded|literal)
+	 * @return	string XML data
+	 * @access   public
+	 */
 	public function serialize($use='encoded') {
 		return $this->serialize_val($this->value, $this->name, $this->type, $this->element_ns, $this->type_ns, $this->attributes, $use, true);
-    }
+	}
 
 	/**
-	* decodes a soapval object into a PHP native type
-	*
-	* @return	mixed
-	* @access   public
-	*/
+	 * decodes a soapval object into a PHP native type
+	 *
+	 * @return	mixed
+	 * @access   public
+	 */
 	public function decode(){
 		return $this->value;
 	}

Spacing +3 added lines, -3 removed lines

@@ -69,7 +69,7 @@ 
 	* @param	mixed $attributes associative array of attributes to add to element serialization
 	* @access   public
 	*/
-  	public function soapval($name='soapval',$type=false,$value=-1,$element_ns=false,$type_ns=false,$attributes=false) {
+  	public function soapval($name = 'soapval', $type = false, $value = -1, $element_ns = false, $type_ns = false, $attributes = false) {
 		parent::nusoap_base();
 		$this->name = $name;
 		$this->type = $type;
@@ -86,7 +86,7 @@ 
 	* @return	string XML data
 	* @access   public
 	*/
-	public function serialize($use='encoded') {
+	public function serialize($use = 'encoded') {
 		return $this->serialize_val($this->value, $this->name, $this->type, $this->element_ns, $this->type_ns, $this->attributes, $use, true);
     }
 
@@ -96,7 +96,7 @@ 
 	* @return	mixed
 	* @access   public
 	*/
-	public function decode(){
+	public function decode() {
 		return $this->value;
 	}
 }

libraries/nusoap/class.wsdl.php

Doc Comments +4 added lines, -3 removed lines

@@ -88,6 +88,7 @@ 
 	 * fetches the WSDL document and parses it
 	 *
 	 * @access public
+	 * @param string $wsdl
 	 */
 	public function fetchWSDL($wsdl) {
 		$this->debug("parse and process WSDL path=$wsdl");
@@ -882,7 +883,7 @@ 
 	/**
 	* serialize the parsed wsdl
 	*
-	* @param mixed $debug whether to put debug=1 in endpoint URL
+	* @param integer $debug whether to put debug=1 in endpoint URL
 	* @return string serialization of WSDL
 	* @access public 
 	*/
@@ -1105,7 +1106,7 @@ 
 	 * @param string $direction (input|output)
 	 * @param mixed $parameters parameter value(s)
 	 * @param string $bindingType (soap|soap12)
-	 * @return mixed parameters serialized as XML or false on error (e.g. operation not found)
+	 * @return false|string parameters serialized as XML or false on error (e.g. operation not found)
 	 * @access public
 	 */
 	public function serializeRPCParameters($operation, $direction, $parameters, $bindingType = 'soap') {
@@ -1205,7 +1206,7 @@ 
 	 * @param string $operation operation name
 	 * @param string $direction (input|output)
 	 * @param mixed $parameters parameter value(s)
-	 * @return mixed parameters serialized as XML or false on error (e.g. operation not found)
+	 * @return false|string parameters serialized as XML or false on error (e.g. operation not found)
 	 * @access public
 	 * @deprecated
 	 */

Indentation +495 added lines, -495 removed lines

@@ -14,35 +14,35 @@ 
 */
 class wsdl extends nusoap_base {
 	// URL or filename of the root of this WSDL
-    var $wsdl; 
-    // define internal arrays of bindings, ports, operations, messages, etc.
-    var $schemas = array();
-    var $currentSchema;
-    var $message = array();
-    var $complexTypes = array();
-    var $messages = array();
-    var $currentMessage;
-    var $currentOperation;
-    var $portTypes = array();
-    var $currentPortType;
-    var $bindings = array();
-    var $currentBinding;
-    var $ports = array();
-    var $currentPort;
-    var $opData = array();
-    var $status = '';
-    var $documentation = false;
-    var $endpoint = ''; 
-    // array of wsdl docs to import
-    var $import = array(); 
-    // parser vars
-    var $parser;
-    var $position = 0;
-    var $depth = 0;
-    var $depth_array = array();
+	var $wsdl; 
+	// define internal arrays of bindings, ports, operations, messages, etc.
+	var $schemas = array();
+	var $currentSchema;
+	var $message = array();
+	var $complexTypes = array();
+	var $messages = array();
+	var $currentMessage;
+	var $currentOperation;
+	var $portTypes = array();
+	var $currentPortType;
+	var $bindings = array();
+	var $currentBinding;
+	var $ports = array();
+	var $currentPort;
+	var $opData = array();
+	var $status = '';
+	var $documentation = false;
+	var $endpoint = ''; 
+	// array of wsdl docs to import
+	var $import = array(); 
+	// parser vars
+	var $parser;
+	var $position = 0;
+	var $depth = 0;
+	var $depth_array = array();
 	// for getting wsdl
 	var $proxyhost = '';
-    var $proxyport = '';
+	var $proxyport = '';
 	var $proxyusername = '';
 	var $proxypassword = '';
 	var $timeout = 0;
@@ -55,10 +55,10 @@ 
 	var $authtype = '';				// Type of HTTP authentication
 	var $certRequest = array();		// Certificate for HTTP SSL authentication
 
-    /**
-     * constructor
-     * 
-     * @param string $wsdl WSDL document URL
+	/**
+	 * constructor
+	 * 
+	 * @param string $wsdl WSDL document URL
 	 * @param string $proxyhost
 	 * @param string $proxyport
 	 * @param string $proxyusername
@@ -67,13 +67,13 @@ 
 	 * @param integer $response_timeout set the response timeout
 	 * @param array $curl_options user-specified cURL options
 	 * @param boolean $use_curl try to use cURL
-     * @access public 
-     */
-    function wsdl($wsdl = '',$proxyhost=false,$proxyport=false,$proxyusername=false,$proxypassword=false,$timeout=0,$response_timeout=30,$curl_options=null,$use_curl=false){
+	 * @access public 
+	 */
+	function wsdl($wsdl = '',$proxyhost=false,$proxyport=false,$proxyusername=false,$proxypassword=false,$timeout=0,$response_timeout=30,$curl_options=null,$use_curl=false){
 		parent::nusoap_base();
 		$this->debug("ctor wsdl=$wsdl timeout=$timeout response_timeout=$response_timeout");
-        $this->proxyhost = $proxyhost;
-        $this->proxyport = $proxyport;
+		$this->proxyhost = $proxyhost;
+		$this->proxyport = $proxyport;
 		$this->proxyusername = $proxyusername;
 		$this->proxypassword = $proxypassword;
 		$this->timeout = $timeout;
@@ -82,7 +82,7 @@ 
 			$this->curl_options = $curl_options;
 		$this->use_curl = $use_curl;
 		$this->fetchWSDL($wsdl);
-    }
+	}
 
 	/**
 	 * fetches the WSDL document and parses it
@@ -92,30 +92,30 @@ 
 	public function fetchWSDL($wsdl) {
 		$this->debug("parse and process WSDL path=$wsdl");
 		$this->wsdl = $wsdl;
-        // parse wsdl file
-        if ($this->wsdl != "") {
-            $this->parseWSDL($this->wsdl);
-        }
-        // imports
-        // TODO: handle imports more properly, grabbing them in-line and nesting them
-    	$imported_urls = array();
-    	$imported = 1;
-    	while ($imported > 0) {
-    		$imported = 0;
-    		// Schema imports
-    		foreach ($this->schemas as $ns => $list) {
-    			foreach ($list as $xs) {
+		// parse wsdl file
+		if ($this->wsdl != "") {
+			$this->parseWSDL($this->wsdl);
+		}
+		// imports
+		// TODO: handle imports more properly, grabbing them in-line and nesting them
+		$imported_urls = array();
+		$imported = 1;
+		while ($imported > 0) {
+			$imported = 0;
+			// Schema imports
+			foreach ($this->schemas as $ns => $list) {
+				foreach ($list as $xs) {
 					$wsdlparts = parse_url($this->wsdl);	// this is bogusly simple!
-		            foreach ($xs->imports as $ns2 => $list2) {
-		                for ($ii = 0; $ii < count($list2); $ii++) {
-		                	if (! $list2[$ii]['loaded']) {
-		                		/*
+					foreach ($xs->imports as $ns2 => $list2) {
+						for ($ii = 0; $ii < count($list2); $ii++) {
+							if (! $list2[$ii]['loaded']) {
+								/*
 		                		 * Substituted with line below
 		                		 * because of error "Warning: attempt to modify property of non-object"
 		                		 * GitHub issue #1
 		                		 */
-		                		$list2[$ii]['loaded'] = true;
-		                		$url = $list2[$ii]['location'];
+								$list2[$ii]['loaded'] = true;
+								$url = $list2[$ii]['location'];
 								if ($url != '') {
 									$urlparts = parse_url($url);
 									if (!isset($urlparts['host'])) {
@@ -123,25 +123,25 @@ 
 												substr($wsdlparts['path'],0,strrpos($wsdlparts['path'],'/') + 1) .$urlparts['path'];
 									}
 									if (! in_array($url, $imported_urls)) {
-					                	$this->parseWSDL($url);
-				                		$imported++;
-				                		$imported_urls[] = $url;
-				                	}
+										$this->parseWSDL($url);
+										$imported++;
+										$imported_urls[] = $url;
+									}
 								} else {
 									$this->debug("Unexpected scenario: empty URL for unloaded import");
 								}
 							}
 						}
-		            } 
-    			}
-    		}
-    		// WSDL imports
+					} 
+				}
+			}
+			// WSDL imports
 			$wsdlparts = parse_url($this->wsdl);	// this is bogusly simple!
-            foreach ($this->import as $ns => $list) {
-                for ($ii = 0; $ii < count($list); $ii++) {
-                	if (! $list[$ii]['loaded']) {
-                		$this->import[$ns][$ii]['loaded'] = true;
-                		$url = $list[$ii]['location'];
+			foreach ($this->import as $ns => $list) {
+				for ($ii = 0; $ii < count($list); $ii++) {
+					if (! $list[$ii]['loaded']) {
+						$this->import[$ns][$ii]['loaded'] = true;
+						$url = $list[$ii]['location'];
 						if ($url != '') {
 							$urlparts = parse_url($url);
 							if (!isset($urlparts['host'])) {
@@ -149,70 +149,70 @@ 
 										substr($wsdlparts['path'],0,strrpos($wsdlparts['path'],'/') + 1) .$urlparts['path'];
 							}
 							if (! in_array($url, $imported_urls)) {
-			                	$this->parseWSDL($url);
-		                		$imported++;
-		                		$imported_urls[] = $url;
-		                	}
+								$this->parseWSDL($url);
+								$imported++;
+								$imported_urls[] = $url;
+							}
 						} else {
 							$this->debug("Unexpected scenario: empty URL for unloaded import");
 						}
 					}
 				}
-            } 
+			} 
 		}
-        // add new data to operation data
-        foreach($this->bindings as $binding => $bindingData) {
-            if (isset($bindingData['operations']) && is_array($bindingData['operations'])) {
-                foreach($bindingData['operations'] as $operation => $data) {
-                    $this->debug('post-parse data gathering for ' . $operation);
-                    $this->bindings[$binding]['operations'][$operation]['input'] = 
+		// add new data to operation data
+		foreach($this->bindings as $binding => $bindingData) {
+			if (isset($bindingData['operations']) && is_array($bindingData['operations'])) {
+				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'];
-                    $this->bindings[$binding]['operations'][$operation]['output'] = 
+					$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'];
-                    if(isset($this->messages[ $this->bindings[$binding]['operations'][$operation]['input']['message'] ])){
+					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'] ];
 					}
 					if(isset($this->messages[ $this->bindings[$binding]['operations'][$operation]['output']['message'] ])){
-                   		$this->bindings[$binding]['operations'][$operation]['output']['parts'] = $this->messages[ $this->bindings[$binding]['operations'][$operation]['output']['message'] ];
-                    }
-                    // Set operation style if necessary, but do not override one already provided
+				   		$this->bindings[$binding]['operations'][$operation]['output']['parts'] = $this->messages[ $this->bindings[$binding]['operations'][$operation]['output']['message'] ];
+					}
+					// Set operation style if necessary, but do not override one already provided
 					if (isset($bindingData['style']) && !isset($this->bindings[$binding]['operations'][$operation]['style'])) {
-                        $this->bindings[$binding]['operations'][$operation]['style'] = $bindingData['style'];
-                    }
-                    $this->bindings[$binding]['operations'][$operation]['transport'] = isset($bindingData['transport']) ? $bindingData['transport'] : '';
-                    $this->bindings[$binding]['operations'][$operation]['documentation'] = isset($this->portTypes[ $bindingData['portType'] ][$operation]['documentation']) ? $this->portTypes[ $bindingData['portType'] ][$operation]['documentation'] : '';
-                    $this->bindings[$binding]['operations'][$operation]['endpoint'] = isset($bindingData['endpoint']) ? $bindingData['endpoint'] : '';
-                } 
-            } 
-        }
+						$this->bindings[$binding]['operations'][$operation]['style'] = $bindingData['style'];
+					}
+					$this->bindings[$binding]['operations'][$operation]['transport'] = isset($bindingData['transport']) ? $bindingData['transport'] : '';
+					$this->bindings[$binding]['operations'][$operation]['documentation'] = isset($this->portTypes[ $bindingData['portType'] ][$operation]['documentation']) ? $this->portTypes[ $bindingData['portType'] ][$operation]['documentation'] : '';
+					$this->bindings[$binding]['operations'][$operation]['endpoint'] = isset($bindingData['endpoint']) ? $bindingData['endpoint'] : '';
+				} 
+			} 
+		}
 	}
 
-    /**
-     * parses the wsdl document
-     * 
-     * @param string $wsdl path or URL
-     * @access private 
-     */
-    function parseWSDL($wsdl = '') {
+	/**
+	 * parses the wsdl document
+	 * 
+	 * @param string $wsdl path or URL
+	 * @access private 
+	 */
+	function parseWSDL($wsdl = '') {
 		$this->debug("parse WSDL at path=$wsdl");
 
-        if ($wsdl == '') {
-            $this->debug('no wsdl passed to parseWSDL()!!');
-            $this->setError('no wsdl passed to parseWSDL()!!');
-            return false;
-        }
+		if ($wsdl == '') {
+			$this->debug('no wsdl passed to parseWSDL()!!');
+			$this->setError('no wsdl passed to parseWSDL()!!');
+			return false;
+		}
         
-        // parse $wsdl for url format
-        $wsdl_props = parse_url($wsdl);
+		// parse $wsdl for url format
+		$wsdl_props = parse_url($wsdl);
 
-        if (isset($wsdl_props['scheme']) && ($wsdl_props['scheme'] == 'http' || $wsdl_props['scheme'] == 'https')) {
-            $this->debug('getting WSDL http(s) URL ' . $wsdl);
-        	// get wsdl
-	        $tr = new soap_transport_http($wsdl, $this->curl_options, $this->use_curl);
+		if (isset($wsdl_props['scheme']) && ($wsdl_props['scheme'] == 'http' || $wsdl_props['scheme'] == 'https')) {
+			$this->debug('getting WSDL http(s) URL ' . $wsdl);
+			// get wsdl
+			$tr = new soap_transport_http($wsdl, $this->curl_options, $this->use_curl);
 			$tr->request_method = 'GET';
 			$tr->useSOAPAction = false;
 			if($this->proxyhost && $this->proxyport){
@@ -228,239 +228,239 @@ 
 			if($err = $tr->getError() ){
 				$errstr = 'Getting ' . $wsdl . ' - HTTP ERROR: '.$err;
 				$this->debug($errstr);
-	            $this->setError($errstr);
+				$this->setError($errstr);
 				unset($tr);
-	            return false;
+				return false;
 			}
 			unset($tr);
 			$this->debug("got WSDL URL");
-        } else {
-            // $wsdl is not http(s), so treat it as a file URL or plain file path
-        	if (isset($wsdl_props['scheme']) && ($wsdl_props['scheme'] == 'file') && isset($wsdl_props['path'])) {
-        		$path = isset($wsdl_props['host']) ? ($wsdl_props['host'] . ':' . $wsdl_props['path']) : $wsdl_props['path'];
-        	} else {
-        		$path = $wsdl;
-        	}
-            $this->debug('getting WSDL file ' . $path);
-            if ($fp = @fopen($path, 'r')) {
-                $wsdl_string = '';
-                while ($data = fread($fp, 32768)) {
-                    $wsdl_string .= $data;
-                } 
-                fclose($fp);
-            } else {
-            	$errstr = "Bad path to WSDL file $path";
-            	$this->debug($errstr);
-                $this->setError($errstr);
-                return false;
-            } 
-        }
-        $this->debug('Parse WSDL');
-        // end new code added
-        // Create an XML parser.
-        $this->parser = xml_parser_create(); 
-        // Set the options for parsing the XML data.
-        // xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 1);
-        xml_parser_set_option($this->parser, XML_OPTION_CASE_FOLDING, 0); 
-        // Set the object for the parser.
-        xml_set_object($this->parser, $this); 
-        // Set the element handlers for the parser.
-        xml_set_element_handler($this->parser, 'start_element', 'end_element');
-        xml_set_character_data_handler($this->parser, 'character_data');
-        // Parse the XML file.
-        if (!xml_parse($this->parser, $wsdl_string, true)) {
-            // Display an error message.
-            $errstr = sprintf(
+		} else {
+			// $wsdl is not http(s), so treat it as a file URL or plain file path
+			if (isset($wsdl_props['scheme']) && ($wsdl_props['scheme'] == 'file') && isset($wsdl_props['path'])) {
+				$path = isset($wsdl_props['host']) ? ($wsdl_props['host'] . ':' . $wsdl_props['path']) : $wsdl_props['path'];
+			} else {
+				$path = $wsdl;
+			}
+			$this->debug('getting WSDL file ' . $path);
+			if ($fp = @fopen($path, 'r')) {
+				$wsdl_string = '';
+				while ($data = fread($fp, 32768)) {
+					$wsdl_string .= $data;
+				} 
+				fclose($fp);
+			} else {
+				$errstr = "Bad path to WSDL file $path";
+				$this->debug($errstr);
+				$this->setError($errstr);
+				return false;
+			} 
+		}
+		$this->debug('Parse WSDL');
+		// end new code added
+		// Create an XML parser.
+		$this->parser = xml_parser_create(); 
+		// Set the options for parsing the XML data.
+		// xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 1);
+		xml_parser_set_option($this->parser, XML_OPTION_CASE_FOLDING, 0); 
+		// Set the object for the parser.
+		xml_set_object($this->parser, $this); 
+		// Set the element handlers for the parser.
+		xml_set_element_handler($this->parser, 'start_element', 'end_element');
+		xml_set_character_data_handler($this->parser, 'character_data');
+		// Parse the XML file.
+		if (!xml_parse($this->parser, $wsdl_string, true)) {
+			// Display an error message.
+			$errstr = sprintf(
 				'XML error parsing WSDL from %s on line %d: %s',
 				$wsdl,
-                xml_get_current_line_number($this->parser),
-                xml_error_string(xml_get_error_code($this->parser))
-                );
-            $this->debug($errstr);
+				xml_get_current_line_number($this->parser),
+				xml_error_string(xml_get_error_code($this->parser))
+				);
+			$this->debug($errstr);
 			$this->debug("XML payload:\n" . $wsdl_string);
-            $this->setError($errstr);
-            return false;
-        } 
+			$this->setError($errstr);
+			return false;
+		} 
 		// free the parser
-        xml_parser_free($this->parser);
-        $this->debug('Parsing WSDL done');
+		xml_parser_free($this->parser);
+		$this->debug('Parsing WSDL done');
 		// catch wsdl parse errors
 		if($this->getError()){
 			return false;
 		}
-        return true;
-    } 
+		return true;
+	} 
 
-    /**
-     * start-element handler
-     * 
-     * @param string $parser XML parser object
-     * @param string $name element name
-     * @param string $attrs associative array of attributes
-     * @access private 
-     */
-    function start_element($parser, $name, $attrs)
-    {
-        if ($this->status == 'schema') {
-            $this->currentSchema->schemaStartElement($parser, $name, $attrs);
-            $this->appendDebug($this->currentSchema->getDebug());
-            $this->currentSchema->clearDebug();
-        } elseif (preg_match('/schema$/', $name)) {
-        	$this->debug('Parsing WSDL schema');
-            $this->status = 'schema';
-            $this->currentSchema = new nusoap_xmlschema('', '', $this->namespaces);
-            $this->currentSchema->schemaStartElement($parser, $name, $attrs);
-            $this->appendDebug($this->currentSchema->getDebug());
-            $this->currentSchema->clearDebug();
-        } else {
-            // position in the total number of elements, starting from 0
-            $pos = $this->position++;
-            $depth = $this->depth++; 
-            // set self as current value for this depth
-            $this->depth_array[$depth] = $pos;
-            $this->message[$pos] = array('cdata' => ''); 
-            // process attributes
-            if (count($attrs) > 0) {
+	/**
+	 * start-element handler
+	 * 
+	 * @param string $parser XML parser object
+	 * @param string $name element name
+	 * @param string $attrs associative array of attributes
+	 * @access private 
+	 */
+	function start_element($parser, $name, $attrs)
+	{
+		if ($this->status == 'schema') {
+			$this->currentSchema->schemaStartElement($parser, $name, $attrs);
+			$this->appendDebug($this->currentSchema->getDebug());
+			$this->currentSchema->clearDebug();
+		} elseif (preg_match('/schema$/', $name)) {
+			$this->debug('Parsing WSDL schema');
+			$this->status = 'schema';
+			$this->currentSchema = new nusoap_xmlschema('', '', $this->namespaces);
+			$this->currentSchema->schemaStartElement($parser, $name, $attrs);
+			$this->appendDebug($this->currentSchema->getDebug());
+			$this->currentSchema->clearDebug();
+		} else {
+			// position in the total number of elements, starting from 0
+			$pos = $this->position++;
+			$depth = $this->depth++; 
+			// set self as current value for this depth
+			$this->depth_array[$depth] = $pos;
+			$this->message[$pos] = array('cdata' => ''); 
+			// process attributes
+			if (count($attrs) > 0) {
 				// register namespace declarations
-                foreach($attrs as $k => $v) {
-                    if (preg_match('/^xmlns/',$k)) {
-                        if ($ns_prefix = substr(strrchr($k, ':'), 1)) {
-                            $this->namespaces[$ns_prefix] = $v;
-                        } else {
-                            $this->namespaces['ns' . (count($this->namespaces) + 1)] = $v;
-                        } 
-                        if ($v == 'http://www.w3.org/2001/XMLSchema' || $v == 'http://www.w3.org/1999/XMLSchema' || $v == 'http://www.w3.org/2000/10/XMLSchema') {
-                            $this->XMLSchemaVersion = $v;
-                            $this->namespaces['xsi'] = $v . '-instance';
-                        } 
-                    }
-                }
-                // expand each attribute prefix to its namespace
-                foreach($attrs as $k => $v) {
-                    $k = strpos($k, ':') ? $this->expandQname($k) : $k;
-                    if ($k != 'location' && $k != 'soapAction' && $k != 'namespace') {
-                        $v = strpos($v, ':') ? $this->expandQname($v) : $v;
-                    } 
-                    $eAttrs[$k] = $v;
-                } 
-                $attrs = $eAttrs;
-            } else {
-                $attrs = array();
-            } 
-            // get element prefix, namespace and name
-            if (preg_match('/:/', $name)) {
-                // get ns prefix
-                $prefix = substr($name, 0, strpos($name, ':')); 
-                // get ns
-                $namespace = isset($this->namespaces[$prefix]) ? $this->namespaces[$prefix] : ''; 
-                // get unqualified name
-                $name = substr(strstr($name, ':'), 1);
-            } 
+				foreach($attrs as $k => $v) {
+					if (preg_match('/^xmlns/',$k)) {
+						if ($ns_prefix = substr(strrchr($k, ':'), 1)) {
+							$this->namespaces[$ns_prefix] = $v;
+						} else {
+							$this->namespaces['ns' . (count($this->namespaces) + 1)] = $v;
+						} 
+						if ($v == 'http://www.w3.org/2001/XMLSchema' || $v == 'http://www.w3.org/1999/XMLSchema' || $v == 'http://www.w3.org/2000/10/XMLSchema') {
+							$this->XMLSchemaVersion = $v;
+							$this->namespaces['xsi'] = $v . '-instance';
+						} 
+					}
+				}
+				// expand each attribute prefix to its namespace
+				foreach($attrs as $k => $v) {
+					$k = strpos($k, ':') ? $this->expandQname($k) : $k;
+					if ($k != 'location' && $k != 'soapAction' && $k != 'namespace') {
+						$v = strpos($v, ':') ? $this->expandQname($v) : $v;
+					} 
+					$eAttrs[$k] = $v;
+				} 
+				$attrs = $eAttrs;
+			} else {
+				$attrs = array();
+			} 
+			// get element prefix, namespace and name
+			if (preg_match('/:/', $name)) {
+				// get ns prefix
+				$prefix = substr($name, 0, strpos($name, ':')); 
+				// get ns
+				$namespace = isset($this->namespaces[$prefix]) ? $this->namespaces[$prefix] : ''; 
+				// get unqualified name
+				$name = substr(strstr($name, ':'), 1);
+			} 
 			// process attributes, expanding any prefixes to namespaces
-            // find status, register data
-            switch ($this->status) {
-                case 'message':
-                    if ($name == 'part') {
-			            if (isset($attrs['type'])) {
-		                    $this->debug("msg " . $this->currentMessage . ": found part (with type) $attrs[name]: " . implode(',', $attrs));
-		                    $this->messages[$this->currentMessage][$attrs['name']] = $attrs['type'];
-            			} 
-			            if (isset($attrs['element'])) {
-		                    $this->debug("msg " . $this->currentMessage . ": found part (with element) $attrs[name]: " . implode(',', $attrs));
-			                $this->messages[$this->currentMessage][$attrs['name']] = $attrs['element'] . '^';
-			            } 
-        			} 
-        			break;
-			    case 'portType':
-			        switch ($name) {
-			            case 'operation':
-			                $this->currentPortOperation = $attrs['name'];
-			                $this->debug("portType $this->currentPortType operation: $this->currentPortOperation");
-			                if (isset($attrs['parameterOrder'])) {
-			                	$this->portTypes[$this->currentPortType][$attrs['name']]['parameterOrder'] = $attrs['parameterOrder'];
-			        		} 
-			        		break;
-					    case 'documentation':
-					        $this->documentation = true;
-					        break; 
-					    // merge input/output data
-					    default:
-					        $m = isset($attrs['message']) ? $this->getLocalPart($attrs['message']) : '';
-					        $this->portTypes[$this->currentPortType][$this->currentPortOperation][$name]['message'] = $m;
-					        break;
+			// find status, register data
+			switch ($this->status) {
+				case 'message':
+					if ($name == 'part') {
+						if (isset($attrs['type'])) {
+							$this->debug("msg " . $this->currentMessage . ": found part (with type) $attrs[name]: " . implode(',', $attrs));
+							$this->messages[$this->currentMessage][$attrs['name']] = $attrs['type'];
+						} 
+						if (isset($attrs['element'])) {
+							$this->debug("msg " . $this->currentMessage . ": found part (with element) $attrs[name]: " . implode(',', $attrs));
+							$this->messages[$this->currentMessage][$attrs['name']] = $attrs['element'] . '^';
+						} 
 					} 
-			    	break;
+					break;
+				case 'portType':
+					switch ($name) {
+						case 'operation':
+							$this->currentPortOperation = $attrs['name'];
+							$this->debug("portType $this->currentPortType operation: $this->currentPortOperation");
+							if (isset($attrs['parameterOrder'])) {
+								$this->portTypes[$this->currentPortType][$attrs['name']]['parameterOrder'] = $attrs['parameterOrder'];
+							} 
+							break;
+						case 'documentation':
+							$this->documentation = true;
+							break; 
+						// merge input/output data
+						default:
+							$m = isset($attrs['message']) ? $this->getLocalPart($attrs['message']) : '';
+							$this->portTypes[$this->currentPortType][$this->currentPortOperation][$name]['message'] = $m;
+							break;
+					} 
+					break;
 				case 'binding':
-				    switch ($name) {
-				        case 'binding': 
-				            // get ns prefix
-				            if (isset($attrs['style'])) {
-				            $this->bindings[$this->currentBinding]['prefix'] = $prefix;
-					    	} 
-					    	$this->bindings[$this->currentBinding] = array_merge($this->bindings[$this->currentBinding], $attrs);
-					    	break;
+					switch ($name) {
+						case 'binding': 
+							// get ns prefix
+							if (isset($attrs['style'])) {
+							$this->bindings[$this->currentBinding]['prefix'] = $prefix;
+							} 
+							$this->bindings[$this->currentBinding] = array_merge($this->bindings[$this->currentBinding], $attrs);
+							break;
 						case 'header':
-						    $this->bindings[$this->currentBinding]['operations'][$this->currentOperation][$this->opStatus]['headers'][] = $attrs;
-						    break;
+							$this->bindings[$this->currentBinding]['operations'][$this->currentOperation][$this->opStatus]['headers'][] = $attrs;
+							break;
 						case 'operation':
-						    if (isset($attrs['soapAction'])) {
-						        $this->bindings[$this->currentBinding]['operations'][$this->currentOperation]['soapAction'] = $attrs['soapAction'];
-						    } 
-						    if (isset($attrs['style'])) {
-						        $this->bindings[$this->currentBinding]['operations'][$this->currentOperation]['style'] = $attrs['style'];
-						    } 
-						    if (isset($attrs['name'])) {
-						        $this->currentOperation = $attrs['name'];
-						        $this->debug("current binding operation: $this->currentOperation");
-						        $this->bindings[$this->currentBinding]['operations'][$this->currentOperation]['name'] = $attrs['name'];
-						        $this->bindings[$this->currentBinding]['operations'][$this->currentOperation]['binding'] = $this->currentBinding;
-						        $this->bindings[$this->currentBinding]['operations'][$this->currentOperation]['endpoint'] = isset($this->bindings[$this->currentBinding]['endpoint']) ? $this->bindings[$this->currentBinding]['endpoint'] : '';
-						    } 
-						    break;
+							if (isset($attrs['soapAction'])) {
+								$this->bindings[$this->currentBinding]['operations'][$this->currentOperation]['soapAction'] = $attrs['soapAction'];
+							} 
+							if (isset($attrs['style'])) {
+								$this->bindings[$this->currentBinding]['operations'][$this->currentOperation]['style'] = $attrs['style'];
+							} 
+							if (isset($attrs['name'])) {
+								$this->currentOperation = $attrs['name'];
+								$this->debug("current binding operation: $this->currentOperation");
+								$this->bindings[$this->currentBinding]['operations'][$this->currentOperation]['name'] = $attrs['name'];
+								$this->bindings[$this->currentBinding]['operations'][$this->currentOperation]['binding'] = $this->currentBinding;
+								$this->bindings[$this->currentBinding]['operations'][$this->currentOperation]['endpoint'] = isset($this->bindings[$this->currentBinding]['endpoint']) ? $this->bindings[$this->currentBinding]['endpoint'] : '';
+							} 
+							break;
 						case 'input':
-						    $this->opStatus = 'input';
-						    break;
+							$this->opStatus = 'input';
+							break;
 						case 'output':
-						    $this->opStatus = 'output';
-						    break;
+							$this->opStatus = 'output';
+							break;
 						case 'body':
-						    if (isset($this->bindings[$this->currentBinding]['operations'][$this->currentOperation][$this->opStatus])) {
-						        $this->bindings[$this->currentBinding]['operations'][$this->currentOperation][$this->opStatus] = array_merge($this->bindings[$this->currentBinding]['operations'][$this->currentOperation][$this->opStatus], $attrs);
-						    } else {
-						        $this->bindings[$this->currentBinding]['operations'][$this->currentOperation][$this->opStatus] = $attrs;
-						    } 
-						    break;
+							if (isset($this->bindings[$this->currentBinding]['operations'][$this->currentOperation][$this->opStatus])) {
+								$this->bindings[$this->currentBinding]['operations'][$this->currentOperation][$this->opStatus] = array_merge($this->bindings[$this->currentBinding]['operations'][$this->currentOperation][$this->opStatus], $attrs);
+							} else {
+								$this->bindings[$this->currentBinding]['operations'][$this->currentOperation][$this->opStatus] = $attrs;
+							} 
+							break;
 					} 
 					break;
 				case 'service':
 					switch ($name) {
-					    case 'port':
-					        $this->currentPort = $attrs['name'];
-					        $this->debug('current port: ' . $this->currentPort);
-					        $this->ports[$this->currentPort]['binding'] = $this->getLocalPart($attrs['binding']);
+						case 'port':
+							$this->currentPort = $attrs['name'];
+							$this->debug('current port: ' . $this->currentPort);
+							$this->ports[$this->currentPort]['binding'] = $this->getLocalPart($attrs['binding']);
 					
-					        break;
-					    case 'address':
-					        $this->ports[$this->currentPort]['location'] = $attrs['location'];
-					        $this->ports[$this->currentPort]['bindingType'] = $namespace;
-					        $this->bindings[ $this->ports[$this->currentPort]['binding'] ]['bindingType'] = $namespace;
-					        $this->bindings[ $this->ports[$this->currentPort]['binding'] ]['endpoint'] = $attrs['location'];
-					        break;
+							break;
+						case 'address':
+							$this->ports[$this->currentPort]['location'] = $attrs['location'];
+							$this->ports[$this->currentPort]['bindingType'] = $namespace;
+							$this->bindings[ $this->ports[$this->currentPort]['binding'] ]['bindingType'] = $namespace;
+							$this->bindings[ $this->ports[$this->currentPort]['binding'] ]['endpoint'] = $attrs['location'];
+							break;
 					} 
 					break;
 			} 
 		// set status
 		switch ($name) {
 			case 'import':
-			    if (isset($attrs['location'])) {
-                    $this->import[$attrs['namespace']][] = array('location' => $attrs['location'], 'loaded' => false);
-                    $this->debug('parsing import ' . $attrs['namespace']. ' - ' . $attrs['location'] . ' (' . count($this->import[$attrs['namespace']]).')');
+				if (isset($attrs['location'])) {
+					$this->import[$attrs['namespace']][] = array('location' => $attrs['location'], 'loaded' => false);
+					$this->debug('parsing import ' . $attrs['namespace']. ' - ' . $attrs['location'] . ' (' . count($this->import[$attrs['namespace']]).')');
 				} else {
-                    $this->import[$attrs['namespace']][] = array('location' => '', 'loaded' => true);
+					$this->import[$attrs['namespace']][] = array('location' => '', 'loaded' => true);
 					if (! $this->getPrefixFromNamespace($attrs['namespace'])) {
 						$this->namespaces['ns'.(count($this->namespaces)+1)] = $attrs['namespace'];
 					}
-                    $this->debug('parsing import ' . $attrs['namespace']. ' - [no location] (' . count($this->import[$attrs['namespace']]).')');
+					$this->debug('parsing import ' . $attrs['namespace']. ' - [no location] (' . count($this->import[$attrs['namespace']]).')');
 				}
 				break;
 			//wait for schema
@@ -481,9 +481,9 @@ 
 				if (isset($attrs['name'])) {
 				// get binding name
 					if (strpos($attrs['name'], ':')) {
-			    		$this->currentBinding = $this->getLocalPart($attrs['name']);
+						$this->currentBinding = $this->getLocalPart($attrs['name']);
 					} else {
-			    		$this->currentBinding = $attrs['name'];
+						$this->currentBinding = $attrs['name'];
 					} 
 					$this->status = 'binding';
 					$this->bindings[$this->currentBinding]['portType'] = $this->getLocalPart($attrs['type']);
@@ -505,20 +505,20 @@ 
 	} 
 
 	/**
-	* end-element handler
-	* 
-	* @param string $parser XML parser object
-	* @param string $name element name
-	* @access private 
-	*/
+	 * end-element handler
+	 * 
+	 * @param string $parser XML parser object
+	 * @param string $name element name
+	 * @access private 
+	 */
 	public function end_element($parser, $name){ 
 		// unset schema status
 		if (/*preg_match('/types$/', $name) ||*/ preg_match('/schema$/', $name)) {
 			$this->status = "";
-            $this->appendDebug($this->currentSchema->getDebug());
-            $this->currentSchema->clearDebug();
+			$this->appendDebug($this->currentSchema->getDebug());
+			$this->currentSchema->clearDebug();
 			$this->schemas[$this->currentSchema->schemaTargetNamespace][] = $this->currentSchema;
-        	$this->debug('Parsing WSDL schema done');
+			$this->debug('Parsing WSDL schema done');
 		} 
 		if ($this->status == 'schema') {
 			$this->currentSchema->schemaEndElement($parser, $name);
@@ -552,14 +552,14 @@ 
 	} 
 
 	/**
-	* if authenticating, set user credentials here
-	*
-	* @param    string $username
-	* @param    string $password
-	* @param	string $authtype (basic|digest|certificate|ntlm)
-	* @param	array $certRequest (keys must be cainfofile (optional), sslcertfile, sslkeyfile, passphrase, certpassword (optional), verifypeer (optional), verifyhost (optional): see corresponding options in cURL docs)
-	* @access   public
-	*/
+	 * if authenticating, set user credentials here
+	 *
+	 * @param    string $username
+	 * @param    string $password
+	 * @param	string $authtype (basic|digest|certificate|ntlm)
+	 * @param	array $certRequest (keys must be cainfofile (optional), sslcertfile, sslkeyfile, passphrase, certpassword (optional), verifypeer (optional), verifyhost (optional): see corresponding options in cURL docs)
+	 * @access   public
+	 */
 	public function setCredentials($username, $password, $authtype = 'basic', $certRequest = array()) {
 		$this->debug("setCredentials username=$username authtype=$authtype certRequest=");
 		$this->appendDebug($this->varDump($certRequest));
@@ -639,7 +639,7 @@ 
 					// note that we could/should also check the namespace here
 					if ($operation == $bOperation) {
 						$opData = $this->bindings[ $portData['binding'] ]['operations'][$operation];
-					    return $opData;
+						return $opData;
 					} 
 				} 
 			}
@@ -667,7 +667,7 @@ 
 				// loop through operations for the binding
 				foreach ($this->bindings[ $portData['binding'] ]['operations'] as $bOperation => $opData) {
 					if ($opData['soapAction'] == $soapAction) {
-					    return $opData;
+						return $opData;
 					} 
 				} 
 			}
@@ -675,23 +675,23 @@ 
 	}
 	
 	/**
-    * returns an array of information about a given type
-    * returns false if no type exists by the given name
-    *
-	*	 typeDef = array(
-	*	 'elements' => array(), // refs to elements array
-	*	'restrictionBase' => '',
-	*	'phpType' => '',
-	*	'order' => '(sequence|all)',
-	*	'attrs' => array() // refs to attributes array
-	*	)
-    *
-    * @param string $type the type
-    * @param string $ns namespace (not prefix) of the type
-    * @return mixed
-    * @access public
-    * @see nusoap_xmlschema
-    */
+	 * returns an array of information about a given type
+	 * returns false if no type exists by the given name
+	 *
+	 *	 typeDef = array(
+	 *	 'elements' => array(), // refs to elements array
+	 *	'restrictionBase' => '',
+	 *	'phpType' => '',
+	 *	'order' => '(sequence|all)',
+	 *	'attrs' => array() // refs to attributes array
+	 *	)
+	 *
+	 * @param string $type the type
+	 * @param string $ns namespace (not prefix) of the type
+	 * @return mixed
+	 * @access public
+	 * @see nusoap_xmlschema
+	 */
 	public function getTypeDef($type, $ns) {
 		$this->debug("in getTypeDef: type=$type, ns=$ns");
 		if ((! $ns) && isset($this->namespaces['tns'])) {
@@ -747,13 +747,13 @@ 
 		return false;
 	}
 
-    /**
-    * prints html description of services
-    *
-    * @access private
-    */
-    function webDescription(){
-    	global $HTTP_SERVER_VARS;
+	/**
+	 * prints html description of services
+	 *
+	 * @access private
+	 */
+	function webDescription(){
+		global $HTTP_SERVER_VARS;
 
 		if (isset($_SERVER)) {
 			$PHP_SELF = $_SERVER['PHP_SELF'];
@@ -847,29 +847,29 @@ 
 				Click on an operation name to view it&apos;s details.</p>
 				<ul>';
 				foreach($this->getOperations() as $op => $data){
-				    $b .= "<li><a href='#' onclick=\"popout();popup('$op')\">$op</a></li>";
-				    // create hidden div
-				    $b .= "<div id='$op' class='hidden'>
+					$b .= "<li><a href='#' onclick=\"popout();popup('$op')\">$op</a></li>";
+					// create hidden div
+					$b .= "<div id='$op' class='hidden'>
 				    <a href='#' onclick='popout()'><font color='#ffffff'>Close</font></a><br><br>";
-				    foreach($data as $donnie => $marie){ // loop through opdata
+					foreach($data as $donnie => $marie){ // loop through opdata
 						if($donnie == 'input' || $donnie == 'output'){ // show input/output data
-						    $b .= "<font color='white'>".ucfirst($donnie).':</font><br>';
-						    foreach($marie as $captain => $tenille){ // loop through data
+							$b .= "<font color='white'>".ucfirst($donnie).':</font><br>';
+							foreach($marie as $captain => $tenille){ // loop through data
 								if($captain == 'parts'){ // loop thru parts
-								    $b .= "&nbsp;&nbsp;$captain:<br>";
-					                //if(is_array($tenille)){
-								    	foreach($tenille as $joanie => $chachi){
+									$b .= "&nbsp;&nbsp;$captain:<br>";
+									//if(is_array($tenille)){
+										foreach($tenille as $joanie => $chachi){
 											$b .= "&nbsp;&nbsp;&nbsp;&nbsp;$joanie: $chachi<br>";
-								    	}
-					        		//}
+										}
+									//}
 								} else {
-								    $b .= "&nbsp;&nbsp;$captain: $tenille<br>";
+									$b .= "&nbsp;&nbsp;$captain: $tenille<br>";
 								}
-						    }
+							}
 						} else {
-						    $b .= "<font color='white'>".ucfirst($donnie).":</font> $marie<br>";
+							$b .= "<font color='white'>".ucfirst($donnie).":</font> $marie<br>";
 						}
-				    }
+					}
 					$b .= '</div>';
 				}
 				$b .= '
@@ -877,15 +877,15 @@ 
 			</div>
 		</div></body></html>';
 		return $b;
-    }
+	}
 
 	/**
-	* serialize the parsed wsdl
-	*
-	* @param mixed $debug whether to put debug=1 in endpoint URL
-	* @return string serialization of WSDL
-	* @access public 
-	*/
+	 * serialize the parsed wsdl
+	 *
+	 * @param mixed $debug whether to put debug=1 in endpoint URL
+	 * @return string serialization of WSDL
+	 * @access public 
+	 */
 	public function serialize($debug = 0)
 	{
 		$xml = '<?xml version="1.0" encoding="ISO-8859-1"?>';
@@ -931,19 +931,19 @@ 
 					foreach($msgParts as $partName => $partType) {
 						// print 'serializing '.$partType.', sv: '.$this->XMLSchemaVersion.'<br>';
 						if (strpos($partType, ':')) {
-						    $typePrefix = $this->getPrefixFromNamespace($this->getPrefix($partType));
+							$typePrefix = $this->getPrefixFromNamespace($this->getPrefix($partType));
 						} elseif (isset($this->typemap[$this->namespaces['xsd']][$partType])) {
-						    // print 'checking typemap: '.$this->XMLSchemaVersion.'<br>';
-						    $typePrefix = 'xsd';
+							// print 'checking typemap: '.$this->XMLSchemaVersion.'<br>';
+							$typePrefix = 'xsd';
 						} else {
-						    foreach($this->typemap as $ns => $types) {
-						        if (isset($types[$partType])) {
-						            $typePrefix = $this->getPrefixFromNamespace($ns);
-						        } 
-						    } 
-						    if (!isset($typePrefix)) {
-						        die("$partType has no namespace!");
-						    } 
+							foreach($this->typemap as $ns => $types) {
+								if (isset($types[$partType])) {
+									$typePrefix = $this->getPrefixFromNamespace($ns);
+								} 
+							} 
+							if (!isset($typePrefix)) {
+								die("$partType has no namespace!");
+							} 
 						}
 						$ns = $this->getNamespaceFromPrefix($typePrefix);
 						$localPart = $this->getLocalPart($partType);
@@ -988,7 +988,7 @@ 
 					$binding_xml .= "\n" . '  </operation>';
 					$portType_xml .= "\n" . '  <operation name="' . $opParts['name'] . '"';
 					if (isset($opParts['parameterOrder'])) {
-					    $portType_xml .= ' parameterOrder="' . $opParts['parameterOrder'] . '"';
+						$portType_xml .= ' parameterOrder="' . $opParts['parameterOrder'] . '"';
 					} 
 					$portType_xml .= '>';
 					if(isset($opParts['documentation']) && $opParts['documentation'] != '') {
@@ -1297,34 +1297,34 @@ 
 		}
 
 		// if a soapval has been supplied, let its type override the WSDL
-    	if (is_object($value) && get_class($value) == 'soapval') {
-    		if ($value->type_ns) {
-    			$type = $value->type_ns . ':' . $value->type;
-		    	$forceType = true;
-		    	$this->debug("in serializeType: soapval overrides type to $type");
-    		} elseif ($value->type) {
-	    		$type = $value->type;
-		    	$forceType = true;
-		    	$this->debug("in serializeType: soapval overrides type to $type");
-	    	} else {
-	    		$forceType = false;
-		    	$this->debug("in serializeType: soapval does not override type");
-	    	}
-	    	$attrs = $value->attributes;
-	    	$value = $value->value;
-	    	$this->debug("in serializeType: soapval overrides value to $value");
-	    	if ($attrs) {
-	    		if (!is_array($value)) {
-	    			$value['!'] = $value;
-	    		}
-	    		foreach ($attrs as $n => $v) {
-	    			$value['!' . $n] = $v;
-	    		}
-		    	$this->debug("in serializeType: soapval provides attributes");
-		    }
-        } else {
-        	$forceType = false;
-        }
+		if (is_object($value) && get_class($value) == 'soapval') {
+			if ($value->type_ns) {
+				$type = $value->type_ns . ':' . $value->type;
+				$forceType = true;
+				$this->debug("in serializeType: soapval overrides type to $type");
+			} elseif ($value->type) {
+				$type = $value->type;
+				$forceType = true;
+				$this->debug("in serializeType: soapval overrides type to $type");
+			} else {
+				$forceType = false;
+				$this->debug("in serializeType: soapval does not override type");
+			}
+			$attrs = $value->attributes;
+			$value = $value->value;
+			$this->debug("in serializeType: soapval overrides value to $value");
+			if ($attrs) {
+				if (!is_array($value)) {
+					$value['!'] = $value;
+				}
+				foreach ($attrs as $n => $v) {
+					$value['!' . $n] = $v;
+				}
+				$this->debug("in serializeType: soapval provides attributes");
+			}
+		} else {
+			$forceType = false;
+		}
 
 		$xml = '';
 		if (strpos($type, ':')) {
@@ -1358,8 +1358,8 @@ 
 					// JBoss/Axis does this sometimes
 					return $this->serialize_val($value, $name, false, false, false, false, $use);
 				}
-		    	if ($uqType == 'boolean') {
-		    		if ((is_string($value) && $value == 'false') || (! $value)) {
+				if ($uqType == 'boolean') {
+					if ((is_string($value) && $value == 'false') || (! $value)) {
 						$value = 'false';
 					} else {
 						$value = 'true';
@@ -1549,9 +1549,9 @@ 
 					$this->debug("serializing array element: $k, $v of type: $typeDef[arrayType]");
 					//if (strpos($typeDef['arrayType'], ':') ) {
 					if (!in_array($typeDef['arrayType'],$this->typemap['http://www.w3.org/2001/XMLSchema'])) {
-					    $contents .= $this->serializeType('item', $typeDef['arrayType'], $v, $use);
+						$contents .= $this->serializeType('item', $typeDef['arrayType'], $v, $use);
 					} else {
-					    $contents .= $this->serialize_val($v, 'item', $typeDef['arrayType'], null, $this->XMLSchemaVersion, false, $use);
+						$contents .= $this->serialize_val($v, 'item', $typeDef['arrayType'], null, $this->XMLSchemaVersion, false, $use);
 					} 
 				}
 			} else {
@@ -1709,7 +1709,7 @@ 
 				}
 				// if user took advantage of a minOccurs=0, then only serialize named parameters
 				if (isset($optionals)
-				    && (!isset($xvalue[$eName])) 
+					&& (!isset($xvalue[$eName])) 
 					&& ( (!isset($attrs['nillable'])) || $attrs['nillable'] != 'true')
 					){
 					if (isset($attrs['minOccurs']) && $attrs['minOccurs'] <> '0') {
@@ -1720,9 +1720,9 @@ 
 				} else {
 					// get value
 					if (isset($xvalue[$eName])) {
-					    $v = $xvalue[$eName];
+						$v = $xvalue[$eName];
 					} else {
-					    $v = null;
+						$v = null;
 					}
 					if (isset($attrs['form'])) {
 						$unqualified = ($attrs['form'] == 'unqualified');
@@ -1734,11 +1734,11 @@ 
 						foreach ($vv as $k => $v) {
 							if (isset($attrs['type']) || isset($attrs['ref'])) {
 								// serialize schema-defined type
-							    $xml .= $this->serializeType($eName, isset($attrs['type']) ? $attrs['type'] : $attrs['ref'], $v, $use, $encodingStyle, $unqualified);
+								$xml .= $this->serializeType($eName, isset($attrs['type']) ? $attrs['type'] : $attrs['ref'], $v, $use, $encodingStyle, $unqualified);
 							} else {
 								// serialize generic type (can this ever really happen?)
-							    $this->debug("calling serialize_val() for $v, $eName, false, false, false, false, $use");
-							    $xml .= $this->serialize_val($v, $eName, false, false, false, false, $use);
+								$this->debug("calling serialize_val() for $v, $eName, false, false, false, false, $use");
+								$xml .= $this->serialize_val($v, $eName, false, false, false, false, $use);
 							}
 						}
 					} else {
@@ -1746,14 +1746,14 @@ 
 							// do nothing
 						} elseif (is_null($v) && isset($attrs['nillable']) && $attrs['nillable'] == 'true') {
 							// TODO: serialize a nil correctly, but for now serialize schema-defined type
-						    $xml .= $this->serializeType($eName, isset($attrs['type']) ? $attrs['type'] : $attrs['ref'], $v, $use, $encodingStyle, $unqualified);
+							$xml .= $this->serializeType($eName, isset($attrs['type']) ? $attrs['type'] : $attrs['ref'], $v, $use, $encodingStyle, $unqualified);
 						} elseif (isset($attrs['type']) || isset($attrs['ref'])) {
 							// serialize schema-defined type
-						    $xml .= $this->serializeType($eName, isset($attrs['type']) ? $attrs['type'] : $attrs['ref'], $v, $use, $encodingStyle, $unqualified);
+							$xml .= $this->serializeType($eName, isset($attrs['type']) ? $attrs['type'] : $attrs['ref'], $v, $use, $encodingStyle, $unqualified);
 						} else {
 							// serialize generic type (can this ever really happen?)
-						    $this->debug("calling serialize_val() for $v, $eName, false, false, false, false, $use");
-						    $xml .= $this->serialize_val($v, $eName, false, false, false, false, $use);
+							$this->debug("calling serialize_val() for $v, $eName, false, false, false, false, $use");
+							$xml .= $this->serialize_val($v, $eName, false, false, false, false, $use);
 						}
 					}
 				}
@@ -1765,46 +1765,46 @@ 
 	}
 
 	/**
-	* adds an XML Schema complex type to the WSDL types
-	*
-	* @param string	$name
-	* @param string $typeClass (complexType|simpleType|attribute)
-	* @param string $phpType currently supported are array and struct (php assoc array)
-	* @param string $compositor (all|sequence|choice)
-	* @param string $restrictionBase namespace:name (http://schemas.xmlsoap.org/soap/encoding/:Array)
-	* @param array $elements e.g. array ( name => array(name=>'',type=>'') )
-	* @param array $attrs e.g. array(array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType'=>'xsd:string[]'))
-	* @param string $arrayType as namespace:name (xsd:string)
-	* @see nusoap_xmlschema
-	* @access public
-	*/
+	 * adds an XML Schema complex type to the WSDL types
+	 *
+	 * @param string	$name
+	 * @param string $typeClass (complexType|simpleType|attribute)
+	 * @param string $phpType currently supported are array and struct (php assoc array)
+	 * @param string $compositor (all|sequence|choice)
+	 * @param string $restrictionBase namespace:name (http://schemas.xmlsoap.org/soap/encoding/:Array)
+	 * @param array $elements e.g. array ( name => array(name=>'',type=>'') )
+	 * @param array $attrs e.g. array(array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType'=>'xsd:string[]'))
+	 * @param string $arrayType as namespace:name (xsd:string)
+	 * @see nusoap_xmlschema
+	 * @access public
+	 */
 	public function addComplexType($name,$typeClass='complexType',$phpType='array',$compositor='',$restrictionBase='',$elements=array(),$attrs=array(),$arrayType='') {
 		if (count($elements) > 0) {
 			$eElements = array();
-	    	foreach($elements as $n => $e){
-	            // expand each element
-	            $ee = array();
-	            foreach ($e as $k => $v) {
-		            $k = strpos($k,':') ? $this->expandQname($k) : $k;
-		            $v = strpos($v,':') ? $this->expandQname($v) : $v;
-		            $ee[$k] = $v;
-		    	}
-	    		$eElements[$n] = $ee;
-	    	}
-	    	$elements = $eElements;
+			foreach($elements as $n => $e){
+				// expand each element
+				$ee = array();
+				foreach ($e as $k => $v) {
+					$k = strpos($k,':') ? $this->expandQname($k) : $k;
+					$v = strpos($v,':') ? $this->expandQname($v) : $v;
+					$ee[$k] = $v;
+				}
+				$eElements[$n] = $ee;
+			}
+			$elements = $eElements;
 		}
 		
 		if (count($attrs) > 0) {
-	    	foreach($attrs as $n => $a){
-	            // expand each attribute
-	            foreach ($a as $k => $v) {
-		            $k = strpos($k,':') ? $this->expandQname($k) : $k;
-		            $v = strpos($v,':') ? $this->expandQname($v) : $v;
-		            $aa[$k] = $v;
-		    	}
-	    		$eAttrs[$n] = $aa;
-	    	}
-	    	$attrs = $eAttrs;
+			foreach($attrs as $n => $a){
+				// expand each attribute
+				foreach ($a as $k => $v) {
+					$k = strpos($k,':') ? $this->expandQname($k) : $k;
+					$v = strpos($v,':') ? $this->expandQname($v) : $v;
+					$aa[$k] = $v;
+				}
+				$eAttrs[$n] = $aa;
+			}
+			$attrs = $eAttrs;
 		}
 
 		$restrictionBase = strpos($restrictionBase,':') ? $this->expandQname($restrictionBase) : $restrictionBase;
@@ -1815,16 +1815,16 @@ 
 	}
 
 	/**
-	* adds an XML Schema simple type to the WSDL types
-	*
-	* @param string $name
-	* @param string $restrictionBase namespace:name (http://schemas.xmlsoap.org/soap/encoding/:Array)
-	* @param string $typeClass (should always be simpleType)
-	* @param string $phpType (should always be scalar)
-	* @param array $enumeration array of values
-	* @see nusoap_xmlschema
-	* @access public
-	*/
+	 * adds an XML Schema simple type to the WSDL types
+	 *
+	 * @param string $name
+	 * @param string $restrictionBase namespace:name (http://schemas.xmlsoap.org/soap/encoding/:Array)
+	 * @param string $typeClass (should always be simpleType)
+	 * @param string $phpType (should always be scalar)
+	 * @param array $enumeration array of values
+	 * @see nusoap_xmlschema
+	 * @access public
+	 */
 	public function addSimpleType($name, $restrictionBase='', $typeClass='simpleType', $phpType='scalar', $enumeration=array()) {
 		$restrictionBase = strpos($restrictionBase,':') ? $this->expandQname($restrictionBase) : $restrictionBase;
 
@@ -1833,31 +1833,31 @@ 
 	}
 
 	/**
-	* adds an element to the WSDL types
-	*
-	* @param array $attrs attributes that must include name and type
-	* @see nusoap_xmlschema
-	* @access public
-	*/
+	 * adds an element to the WSDL types
+	 *
+	 * @param array $attrs attributes that must include name and type
+	 * @see nusoap_xmlschema
+	 * @access public
+	 */
 	public function addElement($attrs) {
 		$typens = isset($this->namespaces['types']) ? $this->namespaces['types'] : $this->namespaces['tns'];
 		$this->schemas[$typens][0]->addElement($attrs);
 	}
 
 	/**
-	* register an operation with the server
-	* 
-	* @param string $name operation (method) name
-	* @param array $in assoc array of input values: key = param name, value = param type
-	* @param array $out assoc array of output values: key = param name, value = param type
-	* @param string $namespace optional The namespace for the operation
-	* @param string $soapaction optional The soapaction for the operation
-	* @param string $style (rpc|document) optional The style for the operation Note: when 'document' is specified, parameter and return wrappers are created for you automatically
-	* @param string $use (encoded|literal) optional The use for the parameters (cannot mix right now)
-	* @param string $documentation optional The description to include in the WSDL
-	* @param string $encodingStyle optional (usually 'http://schemas.xmlsoap.org/soap/encoding/' for encoded)
-	* @access public 
-	*/
+	 * register an operation with the server
+	 * 
+	 * @param string $name operation (method) name
+	 * @param array $in assoc array of input values: key = param name, value = param type
+	 * @param array $out assoc array of output values: key = param name, value = param type
+	 * @param string $namespace optional The namespace for the operation
+	 * @param string $soapaction optional The soapaction for the operation
+	 * @param string $style (rpc|document) optional The style for the operation Note: when 'document' is specified, parameter and return wrappers are created for you automatically
+	 * @param string $use (encoded|literal) optional The use for the parameters (cannot mix right now)
+	 * @param string $documentation optional The description to include in the WSDL
+	 * @param string $encodingStyle optional (usually 'http://schemas.xmlsoap.org/soap/encoding/' for encoded)
+	 * @access public 
+	 */
 	public function addOperation($name, $in = false, $out = false, $namespace = false, $soapaction = false, $style = 'rpc', $use = 'encoded', $documentation = '', $encodingStyle = ''){
 		if ($use == 'encoded' && $encodingStyle == '') {
 			$encodingStyle = 'http://schemas.xmlsoap.org/soap/encoding/';
@@ -1916,8 +1916,8 @@ 
 				$this->messages[$name.'Request'][$pName] = $pType;
 			}
 		} else {
-            $this->messages[$name.'Request']= '0';
-        }
+			$this->messages[$name.'Request']= '0';
+		}
 		if($out)
 		{
 			foreach($out as $pName => $pType)
@@ -1928,8 +1928,8 @@ 
 				$this->messages[$name.'Response'][$pName] = $pType;
 			}
 		} else {
-            $this->messages[$name.'Response']= '0';
-        }
+			$this->messages[$name.'Response']= '0';
+		}
 		return true;
 	} 
 }

Spacing +125 added lines, -127 removed lines

@@ -47,13 +47,13 @@ 
 	var $proxypassword = '';
 	var $timeout = 0;
 	var $response_timeout = 30;
-	var $curl_options = array();	// User-specified cURL options
-	var $use_curl = false;			// whether to always try to use cURL
+	var $curl_options = array(); // User-specified cURL options
+	var $use_curl = false; // whether to always try to use cURL
 	// for HTTP authentication
-	var $username = '';				// Username for HTTP authentication
-	var $password = '';				// Password for HTTP authentication
-	var $authtype = '';				// Type of HTTP authentication
-	var $certRequest = array();		// Certificate for HTTP SSL authentication
+	var $username = ''; // Username for HTTP authentication
+	var $password = ''; // Password for HTTP authentication
+	var $authtype = ''; // Type of HTTP authentication
+	var $certRequest = array(); // Certificate for HTTP SSL authentication
 
     /**
      * constructor
@@ -69,7 +69,7 @@ 
 	 * @param boolean $use_curl try to use cURL
      * @access public 
      */
-    function wsdl($wsdl = '',$proxyhost=false,$proxyport=false,$proxyusername=false,$proxypassword=false,$timeout=0,$response_timeout=30,$curl_options=null,$use_curl=false){
+    function wsdl($wsdl = '', $proxyhost = false, $proxyport = false, $proxyusername = false, $proxypassword = false, $timeout = 0, $response_timeout = 30, $curl_options = null, $use_curl = false) {
 		parent::nusoap_base();
 		$this->debug("ctor wsdl=$wsdl timeout=$timeout response_timeout=$response_timeout");
         $this->proxyhost = $proxyhost;
@@ -105,10 +105,10 @@ 
     		// Schema imports
     		foreach ($this->schemas as $ns => $list) {
     			foreach ($list as $xs) {
-					$wsdlparts = parse_url($this->wsdl);	// this is bogusly simple!
+					$wsdlparts = parse_url($this->wsdl); // this is bogusly simple!
 		            foreach ($xs->imports as $ns2 => $list2) {
 		                for ($ii = 0; $ii < count($list2); $ii++) {
-		                	if (! $list2[$ii]['loaded']) {
+		                	if (!$list2[$ii]['loaded']) {
 		                		/*
 		                		 * Substituted with line below
 		                		 * because of error "Warning: attempt to modify property of non-object"
@@ -119,10 +119,10 @@ 
 								if ($url != '') {
 									$urlparts = parse_url($url);
 									if (!isset($urlparts['host'])) {
-										$url = $wsdlparts['scheme'] . '://' . $wsdlparts['host'] . (isset($wsdlparts['port']) ? ':' .$wsdlparts['port'] : '') .
-												substr($wsdlparts['path'],0,strrpos($wsdlparts['path'],'/') + 1) .$urlparts['path'];
+										$url = $wsdlparts['scheme'] . '://' . $wsdlparts['host'] . (isset($wsdlparts['port']) ? ':' . $wsdlparts['port'] : '') .
+												substr($wsdlparts['path'], 0, strrpos($wsdlparts['path'], '/') + 1) . $urlparts['path'];
 									}
-									if (! in_array($url, $imported_urls)) {
+									if (!in_array($url, $imported_urls)) {
 					                	$this->parseWSDL($url);
 				                		$imported++;
 				                		$imported_urls[] = $url;
@@ -136,19 +136,19 @@ 
     			}
     		}
     		// WSDL imports
-			$wsdlparts = parse_url($this->wsdl);	// this is bogusly simple!
+			$wsdlparts = parse_url($this->wsdl); // this is bogusly simple!
             foreach ($this->import as $ns => $list) {
                 for ($ii = 0; $ii < count($list); $ii++) {
-                	if (! $list[$ii]['loaded']) {
+                	if (!$list[$ii]['loaded']) {
                 		$this->import[$ns][$ii]['loaded'] = true;
                 		$url = $list[$ii]['location'];
 						if ($url != '') {
 							$urlparts = parse_url($url);
 							if (!isset($urlparts['host'])) {
 								$url = $wsdlparts['scheme'] . '://' . $wsdlparts['host'] . (isset($wsdlparts['port']) ? ':' . $wsdlparts['port'] : '') .
-										substr($wsdlparts['path'],0,strrpos($wsdlparts['path'],'/') + 1) .$urlparts['path'];
+										substr($wsdlparts['path'], 0, strrpos($wsdlparts['path'], '/') + 1) . $urlparts['path'];
 							}
-							if (! in_array($url, $imported_urls)) {
+							if (!in_array($url, $imported_urls)) {
 			                	$this->parseWSDL($url);
 		                		$imported++;
 		                		$imported_urls[] = $url;
@@ -161,30 +161,28 @@ 
             } 
 		}
         // add new data to operation data
-        foreach($this->bindings as $binding => $bindingData) {
+        foreach ($this->bindings as $binding => $bindingData) {
             if (isset($bindingData['operations']) && is_array($bindingData['operations'])) {
-                foreach($bindingData['operations'] as $operation => $data) {
+                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'];
-                    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'] ];
+						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']];
 					}
-					if(isset($this->messages[ $this->bindings[$binding]['operations'][$operation]['output']['message'] ])){
-                   		$this->bindings[$binding]['operations'][$operation]['output']['parts'] = $this->messages[ $this->bindings[$binding]['operations'][$operation]['output']['message'] ];
+					if (isset($this->messages[$this->bindings[$binding]['operations'][$operation]['output']['message']])) {
+                   		$this->bindings[$binding]['operations'][$operation]['output']['parts'] = $this->messages[$this->bindings[$binding]['operations'][$operation]['output']['message']];
                     }
                     // Set operation style if necessary, but do not override one already provided
 					if (isset($bindingData['style']) && !isset($this->bindings[$binding]['operations'][$operation]['style'])) {
                         $this->bindings[$binding]['operations'][$operation]['style'] = $bindingData['style'];
                     }
                     $this->bindings[$binding]['operations'][$operation]['transport'] = isset($bindingData['transport']) ? $bindingData['transport'] : '';
-                    $this->bindings[$binding]['operations'][$operation]['documentation'] = isset($this->portTypes[ $bindingData['portType'] ][$operation]['documentation']) ? $this->portTypes[ $bindingData['portType'] ][$operation]['documentation'] : '';
+                    $this->bindings[$binding]['operations'][$operation]['documentation'] = isset($this->portTypes[$bindingData['portType']][$operation]['documentation']) ? $this->portTypes[$bindingData['portType']][$operation]['documentation'] : '';
                     $this->bindings[$binding]['operations'][$operation]['endpoint'] = isset($bindingData['endpoint']) ? $bindingData['endpoint'] : '';
                 } 
             } 
@@ -215,8 +213,8 @@ 
 	        $tr = new soap_transport_http($wsdl, $this->curl_options, $this->use_curl);
 			$tr->request_method = 'GET';
 			$tr->useSOAPAction = false;
-			if($this->proxyhost && $this->proxyport){
-				$tr->setProxy($this->proxyhost,$this->proxyport,$this->proxyusername,$this->proxypassword);
+			if ($this->proxyhost && $this->proxyport) {
+				$tr->setProxy($this->proxyhost, $this->proxyport, $this->proxyusername, $this->proxypassword);
 			}
 			if ($this->authtype != '') {
 				$tr->setCredentials($this->username, $this->password, $this->authtype, array(), $this->certRequest);
@@ -225,8 +223,8 @@ 
 			$wsdl_string = $tr->send('', $this->timeout, $this->response_timeout);
 			$this->appendDebug($tr->getDebug());
 			// catch errors
-			if($err = $tr->getError() ){
-				$errstr = 'Getting ' . $wsdl . ' - HTTP ERROR: '.$err;
+			if ($err = $tr->getError()) {
+				$errstr = 'Getting ' . $wsdl . ' - HTTP ERROR: ' . $err;
 				$this->debug($errstr);
 	            $this->setError($errstr);
 				unset($tr);
@@ -285,7 +283,7 @@ 
         xml_parser_free($this->parser);
         $this->debug('Parsing WSDL done');
 		// catch wsdl parse errors
-		if($this->getError()){
+		if ($this->getError()) {
 			return false;
 		}
         return true;
@@ -322,8 +320,8 @@ 
             // process attributes
             if (count($attrs) > 0) {
 				// register namespace declarations
-                foreach($attrs as $k => $v) {
-                    if (preg_match('/^xmlns/',$k)) {
+                foreach ($attrs as $k => $v) {
+                    if (preg_match('/^xmlns/', $k)) {
                         if ($ns_prefix = substr(strrchr($k, ':'), 1)) {
                             $this->namespaces[$ns_prefix] = $v;
                         } else {
@@ -336,7 +334,7 @@ 
                     }
                 }
                 // expand each attribute prefix to its namespace
-                foreach($attrs as $k => $v) {
+                foreach ($attrs as $k => $v) {
                     $k = strpos($k, ':') ? $this->expandQname($k) : $k;
                     if ($k != 'location' && $k != 'soapAction' && $k != 'namespace') {
                         $v = strpos($v, ':') ? $this->expandQname($v) : $v;
@@ -443,8 +441,8 @@ 
 					    case 'address':
 					        $this->ports[$this->currentPort]['location'] = $attrs['location'];
 					        $this->ports[$this->currentPort]['bindingType'] = $namespace;
-					        $this->bindings[ $this->ports[$this->currentPort]['binding'] ]['bindingType'] = $namespace;
-					        $this->bindings[ $this->ports[$this->currentPort]['binding'] ]['endpoint'] = $attrs['location'];
+					        $this->bindings[$this->ports[$this->currentPort]['binding']]['bindingType'] = $namespace;
+					        $this->bindings[$this->ports[$this->currentPort]['binding']]['endpoint'] = $attrs['location'];
 					        break;
 					} 
 					break;
@@ -454,13 +452,13 @@ 
 			case 'import':
 			    if (isset($attrs['location'])) {
                     $this->import[$attrs['namespace']][] = array('location' => $attrs['location'], 'loaded' => false);
-                    $this->debug('parsing import ' . $attrs['namespace']. ' - ' . $attrs['location'] . ' (' . count($this->import[$attrs['namespace']]).')');
+                    $this->debug('parsing import ' . $attrs['namespace'] . ' - ' . $attrs['location'] . ' (' . count($this->import[$attrs['namespace']]) . ')');
 				} else {
                     $this->import[$attrs['namespace']][] = array('location' => '', 'loaded' => true);
-					if (! $this->getPrefixFromNamespace($attrs['namespace'])) {
-						$this->namespaces['ns'.(count($this->namespaces)+1)] = $attrs['namespace'];
+					if (!$this->getPrefixFromNamespace($attrs['namespace'])) {
+						$this->namespaces['ns' . (count($this->namespaces) + 1)] = $attrs['namespace'];
 					}
-                    $this->debug('parsing import ' . $attrs['namespace']. ' - [no location] (' . count($this->import[$attrs['namespace']]).')');
+                    $this->debug('parsing import ' . $attrs['namespace'] . ' - [no location] (' . count($this->import[$attrs['namespace']]) . ')');
 				}
 				break;
 			//wait for schema
@@ -511,7 +509,7 @@ 
 	* @param string $name element name
 	* @access private 
 	*/
-	public function end_element($parser, $name){ 
+	public function end_element($parser, $name) { 
 		// unset schema status
 		if (/*preg_match('/types$/', $name) ||*/ preg_match('/schema$/', $name)) {
 			$this->status = "";
@@ -595,15 +593,15 @@ 
 		}
 		$this->debug("getOperations for port '$portName' bindingType $bindingType");
 		// loop thru ports
-		foreach($this->ports as $port => $portData) {
+		foreach ($this->ports as $port => $portData) {
 			$this->debug("getOperations checking port $port bindingType " . $portData['bindingType']);
 			if ($portName == '' || $port == $portName) {
 				// binding type of port matches parameter
 				if ($portData['bindingType'] == $bindingType) {
 					$this->debug("getOperations found port $port bindingType $bindingType");
 					// merge bindings
-					if (isset($this->bindings[ $portData['binding'] ]['operations'])) {
-						$ops = array_merge ($ops, $this->bindings[ $portData['binding'] ]['operations']);
+					if (isset($this->bindings[$portData['binding']]['operations'])) {
+						$ops = array_merge($ops, $this->bindings[$portData['binding']]['operations']);
 					}
 				}
 			}
@@ -630,15 +628,15 @@ 
 			$bindingType = 'http://schemas.xmlsoap.org/wsdl/soap12/';
 		}
 		// loop thru ports
-		foreach($this->ports as $port => $portData) {
+		foreach ($this->ports as $port => $portData) {
 			// binding type of port matches parameter
 			if ($portData['bindingType'] == $bindingType) {
 				// get binding
 				//foreach($this->bindings[ $portData['binding'] ]['operations'] as $bOperation => $opData) {
-				foreach(array_keys($this->bindings[ $portData['binding'] ]['operations']) as $bOperation) {
+				foreach (array_keys($this->bindings[$portData['binding']]['operations']) as $bOperation) {
 					// note that we could/should also check the namespace here
 					if ($operation == $bOperation) {
-						$opData = $this->bindings[ $portData['binding'] ]['operations'][$operation];
+						$opData = $this->bindings[$portData['binding']]['operations'][$operation];
 					    return $opData;
 					} 
 				} 
@@ -661,11 +659,11 @@ 
 			$bindingType = 'http://schemas.xmlsoap.org/wsdl/soap12/';
 		}
 		// loop thru ports
-		foreach($this->ports as $port => $portData) {
+		foreach ($this->ports as $port => $portData) {
 			// binding type of port matches parameter
 			if ($portData['bindingType'] == $bindingType) {
 				// loop through operations for the binding
-				foreach ($this->bindings[ $portData['binding'] ]['operations'] as $bOperation => $opData) {
+				foreach ($this->bindings[$portData['binding']]['operations'] as $bOperation => $opData) {
 					if ($opData['soapAction'] == $soapAction) {
 					    return $opData;
 					} 
@@ -694,7 +692,7 @@ 
     */
 	public function getTypeDef($type, $ns) {
 		$this->debug("in getTypeDef: type=$type, ns=$ns");
-		if ((! $ns) && isset($this->namespaces['tns'])) {
+		if ((!$ns) && isset($this->namespaces['tns'])) {
 			$ns = $this->namespaces['tns'];
 			$this->debug("in getTypeDef: type namespace forced to $ns");
 		}
@@ -752,7 +750,7 @@ 
     *
     * @access private
     */
-    function webDescription(){
+    function webDescription() {
     	global $HTTP_SERVER_VARS;
 
 		if (isset($_SERVER)) {
@@ -764,7 +762,7 @@ 
 		}
 
 		$b = '
-		<html><head><title>NuSOAP: '.$this->serviceName.'</title>
+		<html><head><title>NuSOAP: '.$this->serviceName . '</title>
 		<style type="text/css">
 		    body    { font-family: arial; color: #000000; background-color: #ffffff; margin: 0px 0px 0px 0px; }
 		    p       { font-family: arial; color: #000000; margin-top: 0px; margin-bottom: 12px; }
@@ -841,24 +839,24 @@ 
 		<body>
 		<div class=content>
 			<br><br>
-			<div class=title>'.$this->serviceName.'</div>
+			<div class=title>'.$this->serviceName . '</div>
 			<div class=nav>
-				<p>View the <a href="'.$PHP_SELF.'?wsdl">WSDL</a> for the service.
+				<p>View the <a href="'.$PHP_SELF . '?wsdl">WSDL</a> for the service.
 				Click on an operation name to view it&apos;s details.</p>
 				<ul>';
-				foreach($this->getOperations() as $op => $data){
+				foreach ($this->getOperations() as $op => $data) {
 				    $b .= "<li><a href='#' onclick=\"popout();popup('$op')\">$op</a></li>";
 				    // create hidden div
 				    $b .= "<div id='$op' class='hidden'>
 				    <a href='#' onclick='popout()'><font color='#ffffff'>Close</font></a><br><br>";
-				    foreach($data as $donnie => $marie){ // loop through opdata
-						if($donnie == 'input' || $donnie == 'output'){ // show input/output data
-						    $b .= "<font color='white'>".ucfirst($donnie).':</font><br>';
-						    foreach($marie as $captain => $tenille){ // loop through data
-								if($captain == 'parts'){ // loop thru parts
+				    foreach ($data as $donnie => $marie) { // loop through opdata
+						if ($donnie == 'input' || $donnie == 'output') { // show input/output data
+						    $b .= "<font color='white'>" . ucfirst($donnie) . ':</font><br>';
+						    foreach ($marie as $captain => $tenille) { // loop through data
+								if ($captain == 'parts') { // loop thru parts
 								    $b .= "&nbsp;&nbsp;$captain:<br>";
 					                //if(is_array($tenille)){
-								    	foreach($tenille as $joanie => $chachi){
+								    	foreach ($tenille as $joanie => $chachi) {
 											$b .= "&nbsp;&nbsp;&nbsp;&nbsp;$joanie: $chachi<br>";
 								    	}
 					        		//}
@@ -867,7 +865,7 @@ 
 								}
 						    }
 						} else {
-						    $b .= "<font color='white'>".ucfirst($donnie).":</font> $marie<br>";
+						    $b .= "<font color='white'>" . ucfirst($donnie) . ":</font> $marie<br>";
 						}
 				    }
 					$b .= '</div>';
@@ -890,7 +888,7 @@ 
 	{
 		$xml = '<?xml version="1.0" encoding="ISO-8859-1"?>';
 		$xml .= "\n<definitions";
-		foreach($this->namespaces as $k => $v) {
+		foreach ($this->namespaces as $k => $v) {
 			$xml .= " xmlns:$k=\"$v\"";
 		} 
 		// 10.9.02 - add poulter fix for wsdl and tns declarations
@@ -903,7 +901,7 @@ 
 		$xml .= '>'; 
 		// imports
 		if (sizeof($this->import) > 0) {
-			foreach($this->import as $ns => $list) {
+			foreach ($this->import as $ns => $list) {
 				foreach ($list as $ii) {
 					if ($ii['location'] != '') {
 						$xml .= '<import location="' . $ii['location'] . '" namespace="' . $ns . '" />';
@@ -914,7 +912,7 @@ 
 			} 
 		} 
 		// types
-		if (count($this->schemas)>=1) {
+		if (count($this->schemas) >= 1) {
 			$xml .= "\n<types>\n";
 			foreach ($this->schemas as $ns => $list) {
 				foreach ($list as $xs) {
@@ -925,10 +923,10 @@ 
 		} 
 		// messages
 		if (count($this->messages) >= 1) {
-			foreach($this->messages as $msgName => $msgParts) {
+			foreach ($this->messages as $msgName => $msgParts) {
 				$xml .= "\n<message name=\"" . $msgName . '">';
-				if(is_array($msgParts)){
-					foreach($msgParts as $partName => $partType) {
+				if (is_array($msgParts)) {
+					foreach ($msgParts as $partName => $partType) {
 						// print 'serializing '.$partType.', sv: '.$this->XMLSchemaVersion.'<br>';
 						if (strpos($partType, ':')) {
 						    $typePrefix = $this->getPrefixFromNamespace($this->getPrefix($partType));
@@ -936,7 +934,7 @@ 
 						    // print 'checking typemap: '.$this->XMLSchemaVersion.'<br>';
 						    $typePrefix = 'xsd';
 						} else {
-						    foreach($this->typemap as $ns => $types) {
+						    foreach ($this->typemap as $ns => $types) {
 						        if (isset($types[$partType])) {
 						            $typePrefix = $this->getPrefixFromNamespace($ns);
 						        } 
@@ -966,13 +964,13 @@ 
 		if (count($this->bindings) >= 1) {
 			$binding_xml = '';
 			$portType_xml = '';
-			foreach($this->bindings as $bindingName => $attrs) {
+			foreach ($this->bindings as $bindingName => $attrs) {
 				$binding_xml .= "\n<binding name=\"" . $bindingName . '" type="tns:' . $attrs['portType'] . '">';
 				$binding_xml .= "\n" . '  <soap:binding style="' . $attrs['style'] . '" transport="' . $attrs['transport'] . '"/>';
 				$portType_xml .= "\n<portType name=\"" . $attrs['portType'] . '">';
-				foreach($attrs['operations'] as $opName => $opParts) {
+				foreach ($attrs['operations'] as $opName => $opParts) {
 					$binding_xml .= "\n" . '  <operation name="' . $opName . '">';
-					$binding_xml .= "\n" . '    <soap:operation soapAction="' . $opParts['soapAction'] . '" style="'. $opParts['style'] . '"/>';
+					$binding_xml .= "\n" . '    <soap:operation soapAction="' . $opParts['soapAction'] . '" style="' . $opParts['style'] . '"/>';
 					if (isset($opParts['input']['encodingStyle']) && $opParts['input']['encodingStyle'] != '') {
 						$enc_style = ' encodingStyle="' . $opParts['input']['encodingStyle'] . '"';
 					} else {
@@ -991,7 +989,7 @@ 
 					    $portType_xml .= ' parameterOrder="' . $opParts['parameterOrder'] . '"';
 					} 
 					$portType_xml .= '>';
-					if(isset($opParts['documentation']) && $opParts['documentation'] != '') {
+					if (isset($opParts['documentation']) && $opParts['documentation'] != '') {
 						$portType_xml .= "\n" . '    <documentation>' . htmlspecialchars($opParts['documentation']) . '</documentation>';
 					}
 					$portType_xml .= "\n" . '    <input message="tns:' . $opParts['input']['message'] . '"/>';
@@ -1006,7 +1004,7 @@ 
 		// services
 		$xml .= "\n<service name=\"" . $this->serviceName . '">';
 		if (count($this->ports) >= 1) {
-			foreach($this->ports as $pName => $attrs) {
+			foreach ($this->ports as $pName => $attrs) {
 				$xml .= "\n" . '  <port name="' . $pName . '" binding="tns:' . $attrs['binding'] . '">';
 				$xml .= "\n" . '    <soap:address location="' . $attrs['location'] . ($debug ? '?debug=1' : '') . '"/>';
 				$xml .= "\n" . '  </port>';
@@ -1127,7 +1125,7 @@ 
 
 		// Get encoding style for output and set to current
 		$encodingStyle = 'http://schemas.xmlsoap.org/soap/encoding/';
-		if(($direction == 'input') && isset($opData['output']['encodingStyle']) && ($opData['output']['encodingStyle'] != $encodingStyle)) {
+		if (($direction == 'input') && isset($opData['output']['encodingStyle']) && ($opData['output']['encodingStyle'] != $encodingStyle)) {
 			$encodingStyle = $opData['output']['encodingStyle'];
 			$enc_style = $encodingStyle;
 		}
@@ -1229,7 +1227,7 @@ 
 		
 		// Get encoding style for output and set to current
 		$encodingStyle = 'http://schemas.xmlsoap.org/soap/encoding/';
-		if(($direction == 'input') && isset($opData['output']['encodingStyle']) && ($opData['output']['encodingStyle'] != $encodingStyle)) {
+		if (($direction == 'input') && isset($opData['output']['encodingStyle']) && ($opData['output']['encodingStyle'] != $encodingStyle)) {
 			$encodingStyle = $opData['output']['encodingStyle'];
 			$enc_style = $encodingStyle;
 		}
@@ -1244,10 +1242,10 @@ 
 			if (is_array($parameters)) {
 				$parametersArrayType = $this->isArraySimpleOrStruct($parameters);
 				$this->debug('have ' . $parametersArrayType . ' parameters');
-				foreach($opData[$direction]['parts'] as $name => $type) {
-					$this->debug('serializing part "'.$name.'" of type "'.$type.'"');
+				foreach ($opData[$direction]['parts'] as $name => $type) {
+					$this->debug('serializing part "' . $name . '" of type "' . $type . '"');
 					// Track encoding style
-					if(isset($opData[$direction]['encodingStyle']) && $encodingStyle != $opData[$direction]['encodingStyle']) {
+					if (isset($opData[$direction]['encodingStyle']) && $encodingStyle != $opData[$direction]['encodingStyle']) {
 						$encodingStyle = $opData[$direction]['encodingStyle'];			
 						$enc_style = $encodingStyle;
 					} else {
@@ -1288,11 +1286,11 @@ 
 	 * @return string value serialized as an XML string
 	 * @access private
 	 */
-	public function serializeType($name, $type, $value, $use='encoded', $encodingStyle=false, $unqualified=false)
+	public function serializeType($name, $type, $value, $use = 'encoded', $encodingStyle = false, $unqualified = false)
 	{
 		$this->debug("in serializeType: name=$name, type=$type, use=$use, encodingStyle=$encodingStyle, unqualified=" . ($unqualified ? "unqualified" : "qualified"));
 		$this->appendDebug("value=" . $this->varDump($value));
-		if($use == 'encoded' && $encodingStyle) {
+		if ($use == 'encoded' && $encodingStyle) {
 			$encodingStyle = ' SOAP-ENV:encodingStyle="' . $encodingStyle . '"';
 		}
 
@@ -1336,7 +1334,7 @@ 
 				$this->debug("in serializeType: expanded prefixed type: $uqType, $ns");
 			}
 
-			if($ns == $this->XMLSchemaVersion || $ns == 'http://schemas.xmlsoap.org/soap/encoding/'){
+			if ($ns == $this->XMLSchemaVersion || $ns == 'http://schemas.xmlsoap.org/soap/encoding/') {
 				$this->debug('in serializeType: type namespace indicates XML Schema or SOAP Encoding type');
 				if ($unqualified && $use == 'literal') {
 					$elementNS = " xmlns=\"\"";
@@ -1359,7 +1357,7 @@ 
 					return $this->serialize_val($value, $name, false, false, false, false, $use);
 				}
 		    	if ($uqType == 'boolean') {
-		    		if ((is_string($value) && $value == 'false') || (! $value)) {
+		    		if ((is_string($value) && $value == 'false') || (!$value)) {
 						$value = 'false';
 					} else {
 						$value = 'true';
@@ -1392,7 +1390,7 @@ 
 				$this->debug('in serializeType: appears to be Apache SOAP type');
 				if ($uqType == 'Map') {
 					$tt_prefix = $this->getPrefixFromNamespace('http://xml.apache.org/xml-soap');
-					if (! $tt_prefix) {
+					if (!$tt_prefix) {
 						$this->debug('in serializeType: Add namespace for Apache SOAP type');
 						$tt_prefix = 'ns' . rand(1000, 9999);
 						$this->namespaces[$tt_prefix] = 'http://xml.apache.org/xml-soap';
@@ -1400,11 +1398,11 @@ 
 						$tt_prefix = $this->getPrefixFromNamespace('http://xml.apache.org/xml-soap');
 					}
 					$contents = '';
-					foreach($value as $k => $v) {
+					foreach ($value as $k => $v) {
 						$this->debug("serializing map element: key $k, value $v");
 						$contents .= '<item>';
-						$contents .= $this->serialize_val($k,'key',false,false,false,false,$use);
-						$contents .= $this->serialize_val($v,'value',false,false,false,false,$use);
+						$contents .= $this->serialize_val($k, 'key', false, false, false, false, $use);
+						$contents .= $this->serialize_val($v, 'value', false, false, false, false, $use);
 						$contents .= '</item>';
 					}
 					if ($use == 'literal') {
@@ -1428,7 +1426,7 @@ 
 			$ns = '';
 			$uqType = $type;
 		}
-		if(!$typeDef = $this->getTypeDef($uqType, $ns)){
+		if (!$typeDef = $this->getTypeDef($uqType, $ns)) {
 			$this->setError("$type ($uqType) is not a supported type.");
 			$this->debug("in serializeType: $type ($uqType) is not a supported type.");
 			return false;
@@ -1445,7 +1443,7 @@ 
 			return false;
 		}
 		$phpType = $typeDef['phpType'];
-		$this->debug("in serializeType: uqType: $uqType, ns: $ns, phptype: $phpType, arrayType: " . (isset($typeDef['arrayType']) ? $typeDef['arrayType'] : '') ); 
+		$this->debug("in serializeType: uqType: $uqType, ns: $ns, phptype: $phpType, arrayType: " . (isset($typeDef['arrayType']) ? $typeDef['arrayType'] : '')); 
 		// if php type == struct, map value to the <all> element names
 		if ($phpType == 'struct') {
 			if (isset($typeDef['typeClass']) && $typeDef['typeClass'] == 'element') {
@@ -1527,14 +1525,14 @@ 
 						':arrayType="' .
 						$this->getPrefixFromNamespace($this->getPrefix($typeDef['arrayType'])) .
 						':' .
-						$this->getLocalPart($typeDef['arrayType'])."[0]\"/>";
+						$this->getLocalPart($typeDef['arrayType']) . "[0]\"/>";
 				}
 				$this->debug("in serializeType: returning: $xml");
 				return $xml;
 			}
 			if (isset($typeDef['multidimensional'])) {
 				$nv = array();
-				foreach($value as $v) {
+				foreach ($value as $v) {
 					$cols = ',' . sizeof($v);
 					$nv = array_merge($nv, $v);
 				} 
@@ -1545,10 +1543,10 @@ 
 			if (is_array($value) && sizeof($value) >= 1) {
 				$rows = sizeof($value);
 				$contents = '';
-				foreach($value as $k => $v) {
+				foreach ($value as $k => $v) {
 					$this->debug("serializing array element: $k, $v of type: $typeDef[arrayType]");
 					//if (strpos($typeDef['arrayType'], ':') ) {
-					if (!in_array($typeDef['arrayType'],$this->typemap['http://www.w3.org/2001/XMLSchema'])) {
+					if (!in_array($typeDef['arrayType'], $this->typemap['http://www.w3.org/2001/XMLSchema'])) {
 					    $contents .= $this->serializeType('item', $typeDef['arrayType'], $v, $use);
 					} else {
 					    $contents .= $this->serialize_val($v, 'item', $typeDef['arrayType'], null, $this->XMLSchemaVersion, false, $use);
@@ -1565,11 +1563,11 @@ 
 					.$contents
 					."</$name>";
 			} else {
-				$xml = "<$name$elementNS xsi:type=\"".$this->getPrefixFromNamespace('http://schemas.xmlsoap.org/soap/encoding/').':Array" '.
+				$xml = "<$name$elementNS xsi:type=\"" . $this->getPrefixFromNamespace('http://schemas.xmlsoap.org/soap/encoding/') . ':Array" ' .
 					$this->getPrefixFromNamespace('http://schemas.xmlsoap.org/soap/encoding/')
 					.':arrayType="'
 					.$this->getPrefixFromNamespace($this->getPrefix($typeDef['arrayType']))
-					.":".$this->getLocalPart($typeDef['arrayType'])."[$rows$cols]\">"
+					.":" . $this->getLocalPart($typeDef['arrayType']) . "[$rows$cols]\">"
 					.$contents
 					."</$name>";
 			}
@@ -1649,7 +1647,7 @@ 
 					$this->debug("no value provided for attribute $aName");
 				}
 				if ($xname) {
-					$xml .=  " $aName=\"" . $this->expandEntities($xvalue[$xname]) . "\"";
+					$xml .= " $aName=\"" . $this->expandEntities($xvalue[$xname]) . "\"";
 				}
 			} 
 		} else {
@@ -1670,7 +1668,7 @@ 
 	 * @return string value serialized as an XML string
 	 * @access private
 	 */
-	public function serializeComplexTypeElements($typeDef, $value, $ns, $uqType, $use='encoded', $encodingStyle=false) {
+	public function serializeComplexTypeElements($typeDef, $value, $ns, $uqType, $use = 'encoded', $encodingStyle = false) {
 		$this->debug("in serializeComplexTypeElements for XML Schema type $ns:$uqType");
 		$xml = '';
 		if (isset($typeDef['extensionBase'])) {
@@ -1697,7 +1695,7 @@ 
 				$xvalue = array();
 			}
 			// toggle whether all elements are present - ideally should validate against schema
-			if (count($typeDef['elements']) != count($xvalue)){
+			if (count($typeDef['elements']) != count($xvalue)) {
 				$optionals = true;
 			}
 			foreach ($typeDef['elements'] as $eName => $attrs) {
@@ -1710,8 +1708,8 @@ 
 				// 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')
-					){
+					&& ((!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']);
 					}
@@ -1778,15 +1776,15 @@ 
 	* @see nusoap_xmlschema
 	* @access public
 	*/
-	public function addComplexType($name,$typeClass='complexType',$phpType='array',$compositor='',$restrictionBase='',$elements=array(),$attrs=array(),$arrayType='') {
+	public function addComplexType($name, $typeClass = 'complexType', $phpType = 'array', $compositor = '', $restrictionBase = '', $elements = array(), $attrs = array(), $arrayType = '') {
 		if (count($elements) > 0) {
 			$eElements = array();
-	    	foreach($elements as $n => $e){
+	    	foreach ($elements as $n => $e) {
 	            // expand each element
 	            $ee = array();
 	            foreach ($e as $k => $v) {
-		            $k = strpos($k,':') ? $this->expandQname($k) : $k;
-		            $v = strpos($v,':') ? $this->expandQname($v) : $v;
+		            $k = strpos($k, ':') ? $this->expandQname($k) : $k;
+		            $v = strpos($v, ':') ? $this->expandQname($v) : $v;
 		            $ee[$k] = $v;
 		    	}
 	    		$eElements[$n] = $ee;
@@ -1795,11 +1793,11 @@ 
 		}
 		
 		if (count($attrs) > 0) {
-	    	foreach($attrs as $n => $a){
+	    	foreach ($attrs as $n => $a) {
 	            // expand each attribute
 	            foreach ($a as $k => $v) {
-		            $k = strpos($k,':') ? $this->expandQname($k) : $k;
-		            $v = strpos($v,':') ? $this->expandQname($v) : $v;
+		            $k = strpos($k, ':') ? $this->expandQname($k) : $k;
+		            $v = strpos($v, ':') ? $this->expandQname($v) : $v;
 		            $aa[$k] = $v;
 		    	}
 	    		$eAttrs[$n] = $aa;
@@ -1807,11 +1805,11 @@ 
 	    	$attrs = $eAttrs;
 		}
 
-		$restrictionBase = strpos($restrictionBase,':') ? $this->expandQname($restrictionBase) : $restrictionBase;
-		$arrayType = strpos($arrayType,':') ? $this->expandQname($arrayType) : $arrayType;
+		$restrictionBase = strpos($restrictionBase, ':') ? $this->expandQname($restrictionBase) : $restrictionBase;
+		$arrayType = strpos($arrayType, ':') ? $this->expandQname($arrayType) : $arrayType;
 
 		$typens = isset($this->namespaces['types']) ? $this->namespaces['types'] : $this->namespaces['tns'];
-		$this->schemas[$typens][0]->addComplexType($name,$typeClass,$phpType,$compositor,$restrictionBase,$elements,$attrs,$arrayType);
+		$this->schemas[$typens][0]->addComplexType($name, $typeClass, $phpType, $compositor, $restrictionBase, $elements, $attrs, $arrayType);
 	}
 
 	/**
@@ -1825,8 +1823,8 @@ 
 	* @see nusoap_xmlschema
 	* @access public
 	*/
-	public function addSimpleType($name, $restrictionBase='', $typeClass='simpleType', $phpType='scalar', $enumeration=array()) {
-		$restrictionBase = strpos($restrictionBase,':') ? $this->expandQname($restrictionBase) : $restrictionBase;
+	public function addSimpleType($name, $restrictionBase = '', $typeClass = 'simpleType', $phpType = 'scalar', $enumeration = array()) {
+		$restrictionBase = strpos($restrictionBase, ':') ? $this->expandQname($restrictionBase) : $restrictionBase;
 
 		$typens = isset($this->namespaces['types']) ? $this->namespaces['types'] : $this->namespaces['tns'];
 		$this->schemas[$typens][0]->addSimpleType($name, $restrictionBase, $typeClass, $phpType, $enumeration);
@@ -1858,7 +1856,7 @@ 
 	* @param string $encodingStyle optional (usually 'http://schemas.xmlsoap.org/soap/encoding/' for encoded)
 	* @access public 
 	*/
-	public function addOperation($name, $in = false, $out = false, $namespace = false, $soapaction = false, $style = 'rpc', $use = 'encoded', $documentation = '', $encodingStyle = ''){
+	public function addOperation($name, $in = false, $out = false, $namespace = false, $soapaction = false, $style = 'rpc', $use = 'encoded', $documentation = '', $encodingStyle = '') {
 		if ($use == 'encoded' && $encodingStyle == '') {
 			$encodingStyle = 'http://schemas.xmlsoap.org/soap/encoding/';
 		}
@@ -1882,7 +1880,7 @@ 
 		}
 
 		// get binding
-		$this->bindings[ $this->serviceName . 'Binding' ]['operations'][$name] =
+		$this->bindings[$this->serviceName . 'Binding']['operations'][$name] =
 		array(
 		'name' => $name,
 		'binding' => $this->serviceName . 'Binding',
@@ -1906,29 +1904,29 @@ 
 		'documentation' => $documentation); 
 		// add portTypes
 		// add messages
-		if($in)
+		if ($in)
 		{
-			foreach($in as $pName => $pType)
+			foreach ($in as $pName => $pType)
 			{
-				if(strpos($pType,':')) {
-					$pType = $this->getNamespaceFromPrefix($this->getPrefix($pType)).":".$this->getLocalPart($pType);
+				if (strpos($pType, ':')) {
+					$pType = $this->getNamespaceFromPrefix($this->getPrefix($pType)) . ":" . $this->getLocalPart($pType);
 				}
-				$this->messages[$name.'Request'][$pName] = $pType;
+				$this->messages[$name . 'Request'][$pName] = $pType;
 			}
 		} else {
-            $this->messages[$name.'Request']= '0';
+            $this->messages[$name . 'Request'] = '0';
         }
-		if($out)
+		if ($out)
 		{
-			foreach($out as $pName => $pType)
+			foreach ($out as $pName => $pType)
 			{
-				if(strpos($pType,':')) {
-					$pType = $this->getNamespaceFromPrefix($this->getPrefix($pType)).":".$this->getLocalPart($pType);
+				if (strpos($pType, ':')) {
+					$pType = $this->getNamespaceFromPrefix($this->getPrefix($pType)) . ":" . $this->getLocalPart($pType);
 				}
-				$this->messages[$name.'Response'][$pName] = $pType;
+				$this->messages[$name . 'Response'][$pName] = $pType;
 			}
 		} else {
-            $this->messages[$name.'Response']= '0';
+            $this->messages[$name . 'Response'] = '0';
         }
 		return true;
 	} 

Braces +3 added lines, -2 removed lines

@@ -78,8 +78,9 @@
 		$this->proxypassword = $proxypassword;
 		$this->timeout = $timeout;
 		$this->response_timeout = $response_timeout;
-		if (is_array($curl_options))
-			$this->curl_options = $curl_options;
+		if (is_array($curl_options)) {
+					$this->curl_options = $curl_options;
+		}
 		$this->use_curl = $use_curl;
 		$this->fetchWSDL($wsdl);
     }

libraries/nusoap/class.xmlschema.php

Doc Comments +1 added lines, -1 removed lines

@@ -779,7 +779,7 @@
     * returns a sample serialization of a given type, or false if no type by the given name
     *
     * @param string $type name of type
-    * @return mixed
+    * @return string|false
     * @access public
     * @deprecated
     */

Indentation +239 added lines, -239 removed lines

@@ -44,13 +44,13 @@ 
 	var $defaultNamespace = array();
     
 	/**
-	* constructor
-	*
-	* @param    string $schema schema document URI
-	* @param    string $xml xml document URI
-	* @param	string $namespaces namespaces defined in enclosing XML
-	* @access   public
-	*/
+	 * constructor
+	 *
+	 * @param    string $schema schema document URI
+	 * @param    string $xml xml document URI
+	 * @param	string $namespaces namespaces defined in enclosing XML
+	 * @access   public
+	 */
 	public function nusoap_xmlschema($schema='',$xml='',$namespaces=array()){
 		parent::nusoap_base();
 		$this->debug('nusoap_xmlschema class instantiated, inside constructor');
@@ -76,14 +76,14 @@ 
 
 	}
 
-    /**
-    * parse an XML file
-    *
-    * @param string $xml path/URL to XML file
-    * @param string $type (schema | xml)
-	* @return boolean
-    * @access public
-    */
+	/**
+	 * parse an XML file
+	 *
+	 * @param string $xml path/URL to XML file
+	 * @param string $type (schema | xml)
+	 * @return boolean
+	 * @access public
+	 */
 	public function parseFile($xml,$type){
 		// parse xml file
 		if($xml != ""){
@@ -104,35 +104,35 @@ 
 	}
 
 	/**
-	* parse an XML string
-	*
-	* @param    string $xml path or URL
-    * @param	string $type (schema|xml)
-	* @access   private
-	*/
+	 * parse an XML string
+	 *
+	 * @param    string $xml path or URL
+	 * @param	string $type (schema|xml)
+	 * @access   private
+	 */
 	public function parseString($xml,$type){
 		// parse xml string
 		if($xml != ""){
 
-	    	// Create an XML parser.
-	    	$this->parser = xml_parser_create();
-	    	// Set the options for parsing the XML data.
-	    	xml_parser_set_option($this->parser, XML_OPTION_CASE_FOLDING, 0);
+			// Create an XML parser.
+			$this->parser = xml_parser_create();
+			// Set the options for parsing the XML data.
+			xml_parser_set_option($this->parser, XML_OPTION_CASE_FOLDING, 0);
 
-	    	// Set the object for the parser.
-	    	xml_set_object($this->parser, $this);
+			// Set the object for the parser.
+			xml_set_object($this->parser, $this);
 
-	    	// Set the element handlers for the parser.
+			// Set the element handlers for the parser.
 			if($type == "schema"){
-		    	xml_set_element_handler($this->parser, 'schemaStartElement','schemaEndElement');
-		    	xml_set_character_data_handler($this->parser,'schemaCharacterData');
+				xml_set_element_handler($this->parser, 'schemaStartElement','schemaEndElement');
+				xml_set_character_data_handler($this->parser,'schemaCharacterData');
 			} elseif($type == "xml"){
 				xml_set_element_handler($this->parser, 'xmlStartElement','xmlEndElement');
-		    	xml_set_character_data_handler($this->parser,'xmlCharacterData');
+				xml_set_character_data_handler($this->parser,'xmlCharacterData');
 			}
 
-		    // Parse the XML file.
-		    if(!xml_parse($this->parser,$xml,true)){
+			// Parse the XML file.
+			if(!xml_parse($this->parser,$xml,true)){
 			// Display an error message.
 				$errstr = sprintf('XML error parsing XML schema on line %d: %s',
 				xml_get_current_line_number($this->parser),
@@ -141,7 +141,7 @@ 
 				$this->debug($errstr);
 				$this->debug("XML payload:\n" . $xml);
 				$this->setError($errstr);
-	    	}
+			}
             
 			xml_parser_free($this->parser);
 		} else{
@@ -166,13 +166,13 @@ 
 	}
 	
 	/**
-	* start-element handler
-	*
-	* @param    string $parser XML parser object
-	* @param    string $name element name
-	* @param    string $attrs associative array of attributes
-	* @access   private
-	*/
+	 * start-element handler
+	 *
+	 * @param    string $parser XML parser object
+	 * @param    string $name element name
+	 * @param    string $attrs associative array of attributes
+	 * @access   private
+	 */
 	public function schemaStartElement($parser, $name, $attrs) {
 		
 		// position in the total number of elements, starting from 0
@@ -192,15 +192,15 @@ 
 			// get unqualified name
 			$name = $this->getLocalPart($name);
 		} else {
-        	$prefix = '';
-        }
+			$prefix = '';
+		}
 		
-        // loop thru attributes, expanding, and registering namespace declarations
-        if(count($attrs) > 0){
-        	foreach($attrs as $k => $v){
-                // if ns declarations, add to class level array of valid namespaces
+		// loop thru attributes, expanding, and registering namespace declarations
+		if(count($attrs) > 0){
+			foreach($attrs as $k => $v){
+				// if ns declarations, add to class level array of valid namespaces
 				if(preg_match('/^xmlns/',$k)){
-                	if($ns_prefix = substr(strrchr($k,':'),1)){
+					if($ns_prefix = substr(strrchr($k,':'),1)){
 						$this->namespaces[$ns_prefix] = $v;
 					} else {
 						$this->defaultNamespace[$pos] = $v;
@@ -213,17 +213,17 @@ 
 						$this->namespaces['xsi'] = $v.'-instance';
 					}
 				}
-        	}
-        	foreach($attrs as $k => $v){
-                // expand each attribute
-                $k = strpos($k,':') ? $this->expandQname($k) : $k;
-                $v = strpos($v,':') ? $this->expandQname($v) : $v;
-        		$eAttrs[$k] = $v;
-        	}
-        	$attrs = $eAttrs;
-        } else {
-        	$attrs = array();
-        }
+			}
+			foreach($attrs as $k => $v){
+				// expand each attribute
+				$k = strpos($k,':') ? $this->expandQname($k) : $k;
+				$v = strpos($v,':') ? $this->expandQname($v) : $v;
+				$eAttrs[$k] = $v;
+			}
+			$attrs = $eAttrs;
+		} else {
+			$attrs = array();
+		}
 		// find status, register data
 		switch($name){
 			case 'all':			// (optional) compositor content for a complexType
@@ -234,13 +234,13 @@ 
 
 			break;
 			case 'attribute':	// complexType attribute
-            	$this->xdebug("parsing attribute:");
-            	$this->appendDebug($this->varDump($attrs));
+				$this->xdebug("parsing attribute:");
+				$this->appendDebug($this->varDump($attrs));
 				if (!isset($attrs['form'])) {
 					// TODO: handle globals
 					$attrs['form'] = $this->schemaInfo['attributeFormDefault'];
 				}
-            	if (isset($attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'])) {
+				if (isset($attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'])) {
 					$v = $attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'];
 					if (!strpos($v, ':')) {
 						// no namespace in arrayType attribute value...
@@ -249,19 +249,19 @@ 
 							$attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'] = $this->defaultNamespace[$pos] . ':' . $attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'];
 						}
 					}
-            	}
-                if(isset($attrs['name'])){
+				}
+				if(isset($attrs['name'])){
 					$this->attributes[$attrs['name']] = $attrs;
 					$aname = $attrs['name'];
 				} elseif(isset($attrs['ref']) && $attrs['ref'] == 'http://schemas.xmlsoap.org/soap/encoding/:arrayType'){
 					if (isset($attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'])) {
-	                	$aname = $attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'];
-	                } else {
-	                	$aname = '';
-	                }
+						$aname = $attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'];
+					} else {
+						$aname = '';
+					}
 				} elseif(isset($attrs['ref'])){
 					$aname = $attrs['ref'];
-                    $this->attributes[$attrs['ref']] = $attrs;
+					$this->attributes[$attrs['ref']] = $attrs;
 				}
                 
 				if($this->currentComplexType){	// This should *always* be
@@ -270,20 +270,20 @@ 
 				// arrayType attribute
 				if(isset($attrs['http://schemas.xmlsoap.org/wsdl/:arrayType']) || $this->getLocalPart($aname) == 'arrayType'){
 					$this->complexTypes[$this->currentComplexType]['phpType'] = 'array';
-                	$prefix = $this->getPrefix($aname);
+					$prefix = $this->getPrefix($aname);
 					if(isset($attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'])){
 						$v = $attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'];
 					} else {
 						$v = '';
 					}
-                    if(strpos($v,'[,]')){
-                        $this->complexTypes[$this->currentComplexType]['multidimensional'] = true;
-                    }
-                    $v = substr($v,0,strpos($v,'[')); // clip the []
-                    if(!strpos($v,':') && isset($this->typemap[$this->XMLSchemaVersion][$v])){
-                        $v = $this->XMLSchemaVersion.':'.$v;
-                    }
-                    $this->complexTypes[$this->currentComplexType]['arrayType'] = $v;
+					if(strpos($v,'[,]')){
+						$this->complexTypes[$this->currentComplexType]['multidimensional'] = true;
+					}
+					$v = substr($v,0,strpos($v,'[')); // clip the []
+					if(!strpos($v,':') && isset($this->typemap[$this->XMLSchemaVersion][$v])){
+						$v = $this->XMLSchemaVersion.':'.$v;
+					}
+					$this->complexTypes[$this->currentComplexType]['arrayType'] = $v;
 				}
 			break;
 			case 'complexContent':	// (optional) content for a complexType
@@ -406,21 +406,21 @@ 
 				}
 			break;
 			case 'import':
-			    if (isset($attrs['schemaLocation'])) {
+				if (isset($attrs['schemaLocation'])) {
 					$this->xdebug('import namespace ' . $attrs['namespace'] . ' from ' . $attrs['schemaLocation']);
-                    $this->imports[$attrs['namespace']][] = array('location' => $attrs['schemaLocation'], 'loaded' => false);
+					$this->imports[$attrs['namespace']][] = array('location' => $attrs['schemaLocation'], 'loaded' => false);
 				} else {
 					$this->xdebug('import namespace ' . $attrs['namespace']);
-                    $this->imports[$attrs['namespace']][] = array('location' => '', 'loaded' => true);
+					$this->imports[$attrs['namespace']][] = array('location' => '', 'loaded' => true);
 					if (! $this->getPrefixFromNamespace($attrs['namespace'])) {
 						$this->namespaces['ns'.(count($this->namespaces)+1)] = $attrs['namespace'];
 					}
 				}
 			break;
 			case 'include':
-			    if (isset($attrs['schemaLocation'])) {
+				if (isset($attrs['schemaLocation'])) {
 					$this->xdebug('include into namespace ' . $this->schemaTargetNamespace . ' from ' . $attrs['schemaLocation']);
-                    $this->imports[$this->schemaTargetNamespace][] = array('location' => $attrs['schemaLocation'], 'loaded' => false);
+					$this->imports[$this->schemaTargetNamespace][] = array('location' => $attrs['schemaLocation'], 'loaded' => false);
 				} else {
 					$this->xdebug('ignoring invalid XML Schema construct: include without schemaLocation attribute');
 				}
@@ -484,26 +484,26 @@ 
 	}
 
 	/**
-	* end-element handler
-	*
-	* @param    string $parser XML parser object
-	* @param    string $name element name
-	* @access   private
-	*/
+	 * end-element handler
+	 *
+	 * @param    string $parser XML parser object
+	 * @param    string $name element name
+	 * @access   private
+	 */
 	public function schemaEndElement($parser, $name) {
 		// bring depth down a notch
 		$this->depth--;
 		// position of current element is equal to the last value left in depth_array for my depth
 		if(isset($this->depth_array[$this->depth])){
-        	$pos = $this->depth_array[$this->depth];
-        }
+			$pos = $this->depth_array[$this->depth];
+		}
 		// get element prefix
 		if ($prefix = $this->getPrefix($name)){
 			// get unqualified name
 			$name = $this->getLocalPart($name);
 		} else {
-        	$prefix = '';
-        }
+			$prefix = '';
+		}
 		// move on...
 		if($name == 'complexType'){
 			$this->xdebug('done processing complexType ' . ($this->currentComplexType ? $this->currentComplexType : '(unknown)'));
@@ -522,22 +522,22 @@ 
 	}
 
 	/**
-	* element content handler
-	*
-	* @param    string $parser XML parser object
-	* @param    string $data element content
-	* @access   private
-	*/
+	 * element content handler
+	 *
+	 * @param    string $parser XML parser object
+	 * @param    string $data element content
+	 * @access   private
+	 */
 	public function schemaCharacterData($parser, $data){
 		$pos = $this->depth_array[$this->depth - 1];
 		$this->message[$pos]['cdata'] .= $data;
 	}
 
 	/**
-	* serialize the schema
-	*
-	* @access   public
-	*/
+	 * serialize the schema
+	 *
+	 * @access   public
+	 */
 	public function serializeSchema(){
 
 		$schemaPrefix = $this->getPrefixFromNamespace($this->XMLSchemaVersion);
@@ -651,27 +651,27 @@ 
 	}
 
 	/**
-	* adds debug data to the clas level debug string
-	*
-	* @param    string $string debug data
-	* @access   private
-	*/
+	 * adds debug data to the clas level debug string
+	 *
+	 * @param    string $string debug data
+	 * @access   private
+	 */
 	public function xdebug($string){
 		$this->debug('<' . $this->schemaTargetNamespace . '> '.$string);
 	}
 
-    /**
-    * get the PHP type of a user defined type in the schema
-    * PHP type is kind of a misnomer since it actually returns 'struct' for assoc. arrays
-    * returns false if no type exists, or not w/ the given namespace
-    * else returns a string that is either a native php type, or 'struct'
-    *
-    * @param string $type name of defined type
-    * @param string $ns namespace of type
-    * @return mixed
-    * @access public
-    * @deprecated
-    */
+	/**
+	 * get the PHP type of a user defined type in the schema
+	 * PHP type is kind of a misnomer since it actually returns 'struct' for assoc. arrays
+	 * returns false if no type exists, or not w/ the given namespace
+	 * else returns a string that is either a native php type, or 'struct'
+	 *
+	 * @param string $type name of defined type
+	 * @param string $ns namespace of type
+	 * @return mixed
+	 * @access public
+	 * @deprecated
+	 */
 	public function getPHPType($type,$ns){
 		if(isset($this->typemap[$ns][$type])){
 			//print "found type '$type' and ns $ns in typemap<br>";
@@ -684,27 +684,27 @@ 
 	}
 
 	/**
-    * returns an associative array of information about a given type
-    * returns false if no type exists by the given name
-    *
-	*	For a complexType typeDef = array(
-	*	'restrictionBase' => '',
-	*	'phpType' => '',
-	*	'compositor' => '(sequence|all)',
-	*	'elements' => array(), // refs to elements array
-	*	'attrs' => array() // refs to attributes array
-	*	... and so on (see addComplexType)
-	*	)
-	*
-	*   For simpleType or element, the array has different keys.
-    *
-    * @param string $type
-    * @return mixed
-    * @access public
-    * @see addComplexType
-    * @see addSimpleType
-    * @see addElement
-    */
+	 * returns an associative array of information about a given type
+	 * returns false if no type exists by the given name
+	 *
+	 *	For a complexType typeDef = array(
+	 *	'restrictionBase' => '',
+	 *	'phpType' => '',
+	 *	'compositor' => '(sequence|all)',
+	 *	'elements' => array(), // refs to elements array
+	 *	'attrs' => array() // refs to attributes array
+	 *	... and so on (see addComplexType)
+	 *	)
+	 *
+	 *   For simpleType or element, the array has different keys.
+	 *
+	 * @param string $type
+	 * @return mixed
+	 * @access public
+	 * @see addComplexType
+	 * @see addSimpleType
+	 * @see addElement
+	 */
 	public function getTypeDef($type){
 		if (substr($type, -1) == '^') {
 			$is_element = 1;
@@ -776,49 +776,49 @@ 
 	}
 
 	/**
-    * returns a sample serialization of a given type, or false if no type by the given name
-    *
-    * @param string $type name of type
-    * @return mixed
-    * @access public
-    * @deprecated
-    */
-    function serializeTypeDef($type){
-    	//print "in sTD() for type $type<br>";
+	 * returns a sample serialization of a given type, or false if no type by the given name
+	 *
+	 * @param string $type name of type
+	 * @return mixed
+	 * @access public
+	 * @deprecated
+	 */
+	function serializeTypeDef($type){
+		//print "in sTD() for type $type<br>";
 	if($typeDef = $this->getTypeDef($type)){
 		$str .= '<'.$type;
-	    if(is_array($typeDef['attrs'])){
+		if(is_array($typeDef['attrs'])){
 		foreach($typeDef['attrs'] as $attName => $data){
-		    $str .= " $attName=\"{type = ".$data['type']."}\"";
+			$str .= " $attName=\"{type = ".$data['type']."}\"";
 		}
-	    }
-	    $str .= " xmlns=\"".$this->schema['targetNamespace']."\"";
-	    if(count($typeDef['elements']) > 0){
+		}
+		$str .= " xmlns=\"".$this->schema['targetNamespace']."\"";
+		if(count($typeDef['elements']) > 0){
 		$str .= ">";
 		foreach($typeDef['elements'] as $element => $eData){
-		    $str .= $this->serializeTypeDef($element);
+			$str .= $this->serializeTypeDef($element);
 		}
 		$str .= "</$type>";
-	    } elseif($typeDef['typeClass'] == 'element') {
+		} elseif($typeDef['typeClass'] == 'element') {
 		$str .= "></$type>";
-	    } else {
+		} else {
 		$str .= "/>";
-	    }
+		}
 			return $str;
 	}
-    	return false;
-    }
+		return false;
+	}
 
-    /**
-    * returns HTML form elements that allow a user
-    * to enter values for creating an instance of the given type.
-    *
-    * @param string $name name for type instance
-    * @param string $type name of type
-    * @return string
-    * @access public
-    * @deprecated
-	*/
+	/**
+	 * returns HTML form elements that allow a user
+	 * to enter values for creating an instance of the given type.
+	 *
+	 * @param string $name name for type instance
+	 * @param string $type name of type
+	 * @return string
+	 * @access public
+	 * @deprecated
+	 */
 	public function typeToForm($name,$type){
 		// get typedef
 		if($typeDef = $this->getTypeDef($type)){
@@ -851,56 +851,56 @@ 
 	}
 	
 	/**
-	* adds a complex type to the schema
-	* 
-	* example: array
-	* 
-	* addType(
-	* 	'ArrayOfstring',
-	* 	'complexType',
-	* 	'array',
-	* 	'',
-	* 	'SOAP-ENC:Array',
-	* 	array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType'=>'string[]'),
-	* 	'xsd:string'
-	* );
-	* 
-	* example: PHP associative array ( SOAP Struct )
-	* 
-	* addType(
-	* 	'SOAPStruct',
-	* 	'complexType',
-	* 	'struct',
-	* 	'all',
-	* 	array('myVar'=> array('name'=>'myVar','type'=>'string')
-	* );
-	* 
-	* @param name
-	* @param typeClass (complexType|simpleType|attribute)
-	* @param phpType: currently supported are array and struct (php assoc array)
-	* @param compositor (all|sequence|choice)
-	* @param restrictionBase namespace:name (http://schemas.xmlsoap.org/soap/encoding/:Array)
-	* @param elements = array ( name = array(name=>'',type=>'') )
-	* @param attrs = array(
-	* 	array(
-	*		'ref' => "http://schemas.xmlsoap.org/soap/encoding/:arrayType",
-	*		"http://schemas.xmlsoap.org/wsdl/:arrayType" => "string[]"
-	* 	)
-	* )
-	* @param arrayType: namespace:name (http://www.w3.org/2001/XMLSchema:string)
-	* @access public
-	* @see getTypeDef
-	*/
+	 * adds a complex type to the schema
+	 * 
+	 * example: array
+	 * 
+	 * addType(
+	 * 	'ArrayOfstring',
+	 * 	'complexType',
+	 * 	'array',
+	 * 	'',
+	 * 	'SOAP-ENC:Array',
+	 * 	array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType'=>'string[]'),
+	 * 	'xsd:string'
+	 * );
+	 * 
+	 * example: PHP associative array ( SOAP Struct )
+	 * 
+	 * addType(
+	 * 	'SOAPStruct',
+	 * 	'complexType',
+	 * 	'struct',
+	 * 	'all',
+	 * 	array('myVar'=> array('name'=>'myVar','type'=>'string')
+	 * );
+	 * 
+	 * @param name
+	 * @param typeClass (complexType|simpleType|attribute)
+	 * @param phpType: currently supported are array and struct (php assoc array)
+	 * @param compositor (all|sequence|choice)
+	 * @param restrictionBase namespace:name (http://schemas.xmlsoap.org/soap/encoding/:Array)
+	 * @param elements = array ( name = array(name=>'',type=>'') )
+	 * @param attrs = array(
+	 * 	array(
+	 *		'ref' => "http://schemas.xmlsoap.org/soap/encoding/:arrayType",
+	 *		"http://schemas.xmlsoap.org/wsdl/:arrayType" => "string[]"
+	 * 	)
+	 * )
+	 * @param arrayType: namespace:name (http://www.w3.org/2001/XMLSchema:string)
+	 * @access public
+	 * @see getTypeDef
+	 */
 	public function addComplexType($name,$typeClass='complexType',$phpType='array',$compositor='',$restrictionBase='',$elements=array(),$attrs=array(),$arrayType=''){
 		$this->complexTypes[$name] = array(
-	    'name'		=> $name,
-	    'typeClass'	=> $typeClass,
-	    'phpType'	=> $phpType,
+		'name'		=> $name,
+		'typeClass'	=> $typeClass,
+		'phpType'	=> $phpType,
 		'compositor'=> $compositor,
-	    'restrictionBase' => $restrictionBase,
+		'restrictionBase' => $restrictionBase,
 		'elements'	=> $elements,
-	    'attrs'		=> $attrs,
-	    'arrayType'	=> $arrayType
+		'attrs'		=> $attrs,
+		'arrayType'	=> $arrayType
 		);
 		
 		$this->xdebug("addComplexType $name:");
@@ -908,24 +908,24 @@ 
 	}
 	
 	/**
-	* adds a simple type to the schema
-	*
-	* @param string $name
-	* @param string $restrictionBase namespace:name (http://schemas.xmlsoap.org/soap/encoding/:Array)
-	* @param string $typeClass (should always be simpleType)
-	* @param string $phpType (should always be scalar)
-	* @param array $enumeration array of values
-	* @access public
-	* @see nusoap_xmlschema
-	* @see getTypeDef
-	*/
+	 * adds a simple type to the schema
+	 *
+	 * @param string $name
+	 * @param string $restrictionBase namespace:name (http://schemas.xmlsoap.org/soap/encoding/:Array)
+	 * @param string $typeClass (should always be simpleType)
+	 * @param string $phpType (should always be scalar)
+	 * @param array $enumeration array of values
+	 * @access public
+	 * @see nusoap_xmlschema
+	 * @see getTypeDef
+	 */
 	public function addSimpleType($name, $restrictionBase='', $typeClass='simpleType', $phpType='scalar', $enumeration=array()) {
 		$this->simpleTypes[$name] = array(
-	    'name'			=> $name,
-	    'typeClass'		=> $typeClass,
-	    'phpType'		=> $phpType,
-	    'type'			=> $restrictionBase,
-	    'enumeration'	=> $enumeration
+		'name'			=> $name,
+		'typeClass'		=> $typeClass,
+		'phpType'		=> $phpType,
+		'type'			=> $restrictionBase,
+		'enumeration'	=> $enumeration
 		);
 		
 		$this->xdebug("addSimpleType $name:");
@@ -933,12 +933,12 @@ 
 	}
 
 	/**
-	* adds an element to the schema
-	*
-	* @param array $attrs attributes that must include name and type
-	* @see nusoap_xmlschema
-	* @access public
-	*/
+	 * adds an element to the schema
+	 *
+	 * @param array $attrs attributes that must include name and type
+	 * @see nusoap_xmlschema
+	 * @access public
+	 */
 	public function addElement($attrs) {
 		if (! $this->getPrefix($attrs['type'])) {
 			$attrs['type'] = $this->schemaTargetNamespace . ':' . $attrs['type'];

Spacing +134 added lines, -134 removed lines

@@ -12,7 +12,7 @@ 
 * @version  $Id: class.xmlschema.php,v 1.53 2010/04/26 20:15:08 snichol Exp $
 * @access   public
 */
-class nusoap_xmlschema extends nusoap_base  {
+class nusoap_xmlschema extends nusoap_base {
 	
 	// files
 	var $schema = '';
@@ -51,7 +51,7 @@ 
 	* @param	string $namespaces namespaces defined in enclosing XML
 	* @access   public
 	*/
-	public function nusoap_xmlschema($schema='',$xml='',$namespaces=array()){
+	public function nusoap_xmlschema($schema = '', $xml = '', $namespaces = array()) {
 		parent::nusoap_base();
 		$this->debug('nusoap_xmlschema class instantiated, inside constructor');
 		// files
@@ -63,14 +63,14 @@ 
 		$this->namespaces = array_merge($this->namespaces, $namespaces);
 
 		// parse schema file
-		if($schema != ''){
-			$this->debug('initial schema file: '.$schema);
+		if ($schema != '') {
+			$this->debug('initial schema file: ' . $schema);
 			$this->parseFile($schema, 'schema');
 		}
 
 		// parse xml file
-		if($xml != ''){
-			$this->debug('initial xml file: '.$xml);
+		if ($xml != '') {
+			$this->debug('initial xml file: ' . $xml);
 			$this->parseFile($xml, 'xml');
 		}
 
@@ -84,18 +84,18 @@ 
 	* @return boolean
     * @access public
     */
-	public function parseFile($xml,$type){
+	public function parseFile($xml, $type) {
 		// parse xml file
-		if($xml != ""){
-			$xmlStr = @join("",@file($xml));
-			if($xmlStr == ""){
-				$msg = 'Error reading XML from '.$xml;
+		if ($xml != "") {
+			$xmlStr = @join("", @file($xml));
+			if ($xmlStr == "") {
+				$msg = 'Error reading XML from ' . $xml;
 				$this->setError($msg);
 				$this->debug($msg);
 			return false;
 			} else {
 				$this->debug("parsing $xml");
-				$this->parseString($xmlStr,$type);
+				$this->parseString($xmlStr, $type);
 				$this->debug("done parsing $xml");
 			return true;
 			}
@@ -110,9 +110,9 @@ 
     * @param	string $type (schema|xml)
 	* @access   private
 	*/
-	public function parseString($xml,$type){
+	public function parseString($xml, $type) {
 		// parse xml string
-		if($xml != ""){
+		if ($xml != "") {
 
 	    	// Create an XML parser.
 	    	$this->parser = xml_parser_create();
@@ -123,16 +123,16 @@ 
 	    	xml_set_object($this->parser, $this);
 
 	    	// Set the element handlers for the parser.
-			if($type == "schema"){
-		    	xml_set_element_handler($this->parser, 'schemaStartElement','schemaEndElement');
-		    	xml_set_character_data_handler($this->parser,'schemaCharacterData');
-			} elseif($type == "xml"){
-				xml_set_element_handler($this->parser, 'xmlStartElement','xmlEndElement');
-		    	xml_set_character_data_handler($this->parser,'xmlCharacterData');
+			if ($type == "schema") {
+		    	xml_set_element_handler($this->parser, 'schemaStartElement', 'schemaEndElement');
+		    	xml_set_character_data_handler($this->parser, 'schemaCharacterData');
+			} elseif ($type == "xml") {
+				xml_set_element_handler($this->parser, 'xmlStartElement', 'xmlEndElement');
+		    	xml_set_character_data_handler($this->parser, 'xmlCharacterData');
 			}
 
 		    // Parse the XML file.
-		    if(!xml_parse($this->parser,$xml,true)){
+		    if (!xml_parse($this->parser, $xml, true)) {
 			// Display an error message.
 				$errstr = sprintf('XML error parsing XML schema on line %d: %s',
 				xml_get_current_line_number($this->parser),
@@ -144,7 +144,7 @@ 
 	    	}
             
 			xml_parser_free($this->parser);
-		} else{
+		} else {
 			$this->debug('no xml passed to parseString()!!');
 			$this->setError('no xml passed to parseString()!!');
 		}
@@ -188,7 +188,7 @@ 
 		}
 
 		// get element prefix
-		if($prefix = $this->getPrefix($name)){
+		if ($prefix = $this->getPrefix($name)) {
 			// get unqualified name
 			$name = $this->getLocalPart($name);
 		} else {
@@ -196,28 +196,28 @@ 
         }
 		
         // loop thru attributes, expanding, and registering namespace declarations
-        if(count($attrs) > 0){
-        	foreach($attrs as $k => $v){
+        if (count($attrs) > 0) {
+        	foreach ($attrs as $k => $v) {
                 // if ns declarations, add to class level array of valid namespaces
-				if(preg_match('/^xmlns/',$k)){
-                	if($ns_prefix = substr(strrchr($k,':'),1)){
+				if (preg_match('/^xmlns/', $k)) {
+                	if ($ns_prefix = substr(strrchr($k, ':'), 1)) {
 						$this->namespaces[$ns_prefix] = $v;
 					} else {
 						$this->defaultNamespace[$pos] = $v;
-						if (! $this->getPrefixFromNamespace($v)) {
-							$this->namespaces['ns'.(count($this->namespaces)+1)] = $v;
+						if (!$this->getPrefixFromNamespace($v)) {
+							$this->namespaces['ns' . (count($this->namespaces) + 1)] = $v;
 						}
 					}
-					if($v == 'http://www.w3.org/2001/XMLSchema' || $v == 'http://www.w3.org/1999/XMLSchema' || $v == 'http://www.w3.org/2000/10/XMLSchema'){
+					if ($v == 'http://www.w3.org/2001/XMLSchema' || $v == 'http://www.w3.org/1999/XMLSchema' || $v == 'http://www.w3.org/2000/10/XMLSchema') {
 						$this->XMLSchemaVersion = $v;
-						$this->namespaces['xsi'] = $v.'-instance';
+						$this->namespaces['xsi'] = $v . '-instance';
 					}
 				}
         	}
-        	foreach($attrs as $k => $v){
+        	foreach ($attrs as $k => $v) {
                 // expand each attribute
-                $k = strpos($k,':') ? $this->expandQname($k) : $k;
-                $v = strpos($v,':') ? $this->expandQname($v) : $v;
+                $k = strpos($k, ':') ? $this->expandQname($k) : $k;
+                $v = strpos($v, ':') ? $this->expandQname($v) : $v;
         		$eAttrs[$k] = $v;
         	}
         	$attrs = $eAttrs;
@@ -225,7 +225,7 @@ 
         	$attrs = array();
         }
 		// find status, register data
-		switch($name){
+		switch ($name) {
 			case 'all':			// (optional) compositor content for a complexType
 			case 'choice':
 			case 'group':
@@ -250,38 +250,38 @@ 
 						}
 					}
             	}
-                if(isset($attrs['name'])){
+                if (isset($attrs['name'])) {
 					$this->attributes[$attrs['name']] = $attrs;
 					$aname = $attrs['name'];
-				} elseif(isset($attrs['ref']) && $attrs['ref'] == 'http://schemas.xmlsoap.org/soap/encoding/:arrayType'){
+				} elseif (isset($attrs['ref']) && $attrs['ref'] == 'http://schemas.xmlsoap.org/soap/encoding/:arrayType') {
 					if (isset($attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'])) {
 	                	$aname = $attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'];
 	                } else {
 	                	$aname = '';
 	                }
-				} elseif(isset($attrs['ref'])){
+				} elseif (isset($attrs['ref'])) {
 					$aname = $attrs['ref'];
                     $this->attributes[$attrs['ref']] = $attrs;
 				}
                 
-				if($this->currentComplexType){	// This should *always* be
+				if ($this->currentComplexType) {	// This should *always* be
 					$this->complexTypes[$this->currentComplexType]['attrs'][$aname] = $attrs;
 				}
 				// arrayType attribute
-				if(isset($attrs['http://schemas.xmlsoap.org/wsdl/:arrayType']) || $this->getLocalPart($aname) == 'arrayType'){
+				if (isset($attrs['http://schemas.xmlsoap.org/wsdl/:arrayType']) || $this->getLocalPart($aname) == 'arrayType') {
 					$this->complexTypes[$this->currentComplexType]['phpType'] = 'array';
                 	$prefix = $this->getPrefix($aname);
-					if(isset($attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'])){
+					if (isset($attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'])) {
 						$v = $attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'];
 					} else {
 						$v = '';
 					}
-                    if(strpos($v,'[,]')){
+                    if (strpos($v, '[,]')) {
                         $this->complexTypes[$this->currentComplexType]['multidimensional'] = true;
                     }
-                    $v = substr($v,0,strpos($v,'[')); // clip the []
-                    if(!strpos($v,':') && isset($this->typemap[$this->XMLSchemaVersion][$v])){
-                        $v = $this->XMLSchemaVersion.':'.$v;
+                    $v = substr($v, 0, strpos($v, '[')); // clip the []
+                    if (!strpos($v, ':') && isset($this->typemap[$this->XMLSchemaVersion][$v])) {
+                        $v = $this->XMLSchemaVersion . ':' . $v;
                     }
                     $this->complexTypes[$this->currentComplexType]['arrayType'] = $v;
 				}
@@ -291,10 +291,10 @@ 
 			break;
 			case 'complexType':
 				array_push($this->complexTypeStack, $this->currentComplexType);
-				if(isset($attrs['name'])){
+				if (isset($attrs['name'])) {
 					// TODO: what is the scope of named complexTypes that appear
 					//       nested within other c complexTypes?
-					$this->xdebug('processing named complexType '.$attrs['name']);
+					$this->xdebug('processing named complexType ' . $attrs['name']);
 					$this->currentComplexType = $attrs['name'];
 					$this->complexTypes[$this->currentComplexType] = $attrs;
 					$this->complexTypes[$this->currentComplexType]['typeClass'] = 'complexType';
@@ -305,7 +305,7 @@ 
 					//                        minOccurs="0" maxOccurs="unbounded" />
 					//                </sequence>
 					//            </complexType>
-					if(isset($attrs['base']) && preg_match('/:Array$/',$attrs['base'])){
+					if (isset($attrs['base']) && preg_match('/:Array$/', $attrs['base'])) {
 						$this->xdebug('complexType is unusual array');
 						$this->complexTypes[$this->currentComplexType]['phpType'] = 'array';
 					} else {
@@ -324,7 +324,7 @@ 
 					//                        minOccurs="0" maxOccurs="unbounded" />
 					//                </sequence>
 					//            </complexType>
-					if(isset($attrs['base']) && preg_match('/:Array$/',$attrs['base'])){
+					if (isset($attrs['base']) && preg_match('/:Array$/', $attrs['base'])) {
 						$this->xdebug('complexType is unusual array');
 						$this->complexTypes[$this->currentComplexType]['phpType'] = 'array';
 					} else {
@@ -343,9 +343,9 @@ 
 						$attrs['form'] = 'qualified';
 					}
 				}
-				if(isset($attrs['type'])){
-					$this->xdebug("processing typed element ".$attrs['name']." of type ".$attrs['type']);
-					if (! $this->getPrefix($attrs['type'])) {
+				if (isset($attrs['type'])) {
+					$this->xdebug("processing typed element " . $attrs['name'] . " of type " . $attrs['type']);
+					if (!$this->getPrefix($attrs['type'])) {
 						if ($this->defaultNamespace[$pos]) {
 							$attrs['type'] = $this->defaultNamespace[$pos] . ':' . $attrs['type'];
 							$this->xdebug('used default namespace to make type ' . $attrs['type']);
@@ -364,9 +364,9 @@ 
 					}
 					$this->currentElement = $attrs['name'];
 					$ename = $attrs['name'];
-				} elseif(isset($attrs['ref'])){
-					$this->xdebug("processing element as ref to ".$attrs['ref']);
-					$this->currentElement = "ref to ".$attrs['ref'];
+				} elseif (isset($attrs['ref'])) {
+					$this->xdebug("processing element as ref to " . $attrs['ref']);
+					$this->currentElement = "ref to " . $attrs['ref'];
 					$ename = $this->getLocalPart($attrs['ref']);
 				} else {
 					$type = $this->CreateTypeName($this->currentComplexType . '_' . $attrs['name']);
@@ -380,8 +380,8 @@ 
 					$this->complexTypes[$this->currentComplexType]['elements'][$ename] = $attrs;
 				} elseif (!isset($attrs['ref'])) {
 					$this->xdebug("add element $ename to elements array");
-					$this->elements[ $attrs['name'] ] = $attrs;
-					$this->elements[ $attrs['name'] ]['typeClass'] = 'element';
+					$this->elements[$attrs['name']] = $attrs;
+					$this->elements[$attrs['name']]['typeClass'] = 'element';
 				}
 			break;
 			case 'enumeration':	//	restriction value list member
@@ -412,8 +412,8 @@ 
 				} else {
 					$this->xdebug('import namespace ' . $attrs['namespace']);
                     $this->imports[$attrs['namespace']][] = array('location' => '', 'loaded' => true);
-					if (! $this->getPrefixFromNamespace($attrs['namespace'])) {
-						$this->namespaces['ns'.(count($this->namespaces)+1)] = $attrs['namespace'];
+					if (!$this->getPrefixFromNamespace($attrs['namespace'])) {
+						$this->namespaces['ns' . (count($this->namespaces) + 1)] = $attrs['namespace'];
 					}
 				}
 			break;
@@ -430,11 +430,11 @@ 
 			break;
 			case 'restriction':	// simpleType, simpleContent or complexContent value restriction
 				$this->xdebug('restriction ' . $attrs['base']);
-				if($this->currentSimpleType){
+				if ($this->currentSimpleType) {
 					$this->simpleTypes[$this->currentSimpleType]['type'] = $attrs['base'];
-				} elseif($this->currentComplexType){
+				} elseif ($this->currentComplexType) {
 					$this->complexTypes[$this->currentComplexType]['restrictionBase'] = $attrs['base'];
-					if(strstr($attrs['base'],':') == ':Array'){
+					if (strstr($attrs['base'], ':') == ':Array') {
 						$this->complexTypes[$this->currentComplexType]['phpType'] = 'array';
 					}
 				}
@@ -461,12 +461,12 @@ 
 			break;
 			case 'simpleType':
 				array_push($this->simpleTypeStack, $this->currentSimpleType);
-				if(isset($attrs['name'])){
+				if (isset($attrs['name'])) {
 					$this->xdebug("processing simpleType for name " . $attrs['name']);
 					$this->currentSimpleType = $attrs['name'];
-					$this->simpleTypes[ $attrs['name'] ] = $attrs;
-					$this->simpleTypes[ $attrs['name'] ]['typeClass'] = 'simpleType';
-					$this->simpleTypes[ $attrs['name'] ]['phpType'] = 'scalar';
+					$this->simpleTypes[$attrs['name']] = $attrs;
+					$this->simpleTypes[$attrs['name']]['typeClass'] = 'simpleType';
+					$this->simpleTypes[$attrs['name']]['phpType'] = 'scalar';
 				} else {
 					$name = $this->CreateTypeName($this->currentComplexType . '_' . $this->currentElement);
 					$this->xdebug('processing unnamed simpleType for element ' . $this->currentElement . ' named ' . $name);
@@ -494,27 +494,27 @@ 
 		// bring depth down a notch
 		$this->depth--;
 		// position of current element is equal to the last value left in depth_array for my depth
-		if(isset($this->depth_array[$this->depth])){
+		if (isset($this->depth_array[$this->depth])) {
         	$pos = $this->depth_array[$this->depth];
         }
 		// get element prefix
-		if ($prefix = $this->getPrefix($name)){
+		if ($prefix = $this->getPrefix($name)) {
 			// get unqualified name
 			$name = $this->getLocalPart($name);
 		} else {
         	$prefix = '';
         }
 		// move on...
-		if($name == 'complexType'){
+		if ($name == 'complexType') {
 			$this->xdebug('done processing complexType ' . ($this->currentComplexType ? $this->currentComplexType : '(unknown)'));
 			$this->xdebug($this->varDump($this->complexTypes[$this->currentComplexType]));
 			$this->currentComplexType = array_pop($this->complexTypeStack);
 		}
-		if($name == 'element'){
+		if ($name == 'element') {
 			$this->xdebug('done processing element ' . ($this->currentElement ? $this->currentElement : '(unknown)'));
 			$this->currentElement = array_pop($this->elementStack);
 		}
-		if($name == 'simpleType'){
+		if ($name == 'simpleType') {
 			$this->xdebug('done processing simpleType ' . ($this->currentSimpleType ? $this->currentSimpleType : '(unknown)'));
 			$this->xdebug($this->varDump($this->simpleTypes[$this->currentSimpleType]));
 			$this->currentSimpleType = array_pop($this->simpleTypeStack);
@@ -528,7 +528,7 @@ 
 	* @param    string $data element content
 	* @access   private
 	*/
-	public function schemaCharacterData($parser, $data){
+	public function schemaCharacterData($parser, $data) {
 		$pos = $this->depth_array[$this->depth - 1];
 		$this->message[$pos]['cdata'] .= $data;
 	}
@@ -538,13 +538,13 @@ 
 	*
 	* @access   public
 	*/
-	public function serializeSchema(){
+	public function serializeSchema() {
 
 		$schemaPrefix = $this->getPrefixFromNamespace($this->XMLSchemaVersion);
 		$xml = '';
 		// imports
 		if (sizeof($this->imports) > 0) {
-			foreach($this->imports as $ns => $list) {
+			foreach ($this->imports as $ns => $list) {
 				foreach ($list as $ii) {
 					if ($ii['location'] != '') {
 						$xml .= " <$schemaPrefix:import location=\"" . $ii['location'] . '" namespace="' . $ns . "\" />\n";
@@ -555,12 +555,12 @@ 
 			} 
 		} 
 		// complex types
-		foreach($this->complexTypes as $typeName => $attrs){
+		foreach ($this->complexTypes as $typeName => $attrs) {
 			$contentStr = '';
 			// serialize child elements
-			if(isset($attrs['elements']) && (count($attrs['elements']) > 0)){
-				foreach($attrs['elements'] as $element => $eParts){
-					if(isset($eParts['ref'])){
+			if (isset($attrs['elements']) && (count($attrs['elements']) > 0)) {
+				foreach ($attrs['elements'] as $element => $eParts) {
+					if (isset($eParts['ref'])) {
 						$contentStr .= "   <$schemaPrefix:element ref=\"$element\"/>\n";
 					} else {
 						$contentStr .= "   <$schemaPrefix:element name=\"$element\" type=\"" . $this->contractQName($eParts['type']) . "\"";
@@ -575,19 +575,19 @@ 
 				}
 				// compositor wraps elements
 				if (isset($attrs['compositor']) && ($attrs['compositor'] != '')) {
-					$contentStr = "  <$schemaPrefix:$attrs[compositor]>\n".$contentStr."  </$schemaPrefix:$attrs[compositor]>\n";
+					$contentStr = "  <$schemaPrefix:$attrs[compositor]>\n" . $contentStr . "  </$schemaPrefix:$attrs[compositor]>\n";
 				}
 			}
 			// attributes
-			if(isset($attrs['attrs']) && (count($attrs['attrs']) >= 1)){
-				foreach($attrs['attrs'] as $attr => $aParts){
+			if (isset($attrs['attrs']) && (count($attrs['attrs']) >= 1)) {
+				foreach ($attrs['attrs'] as $attr => $aParts) {
 					$contentStr .= "    <$schemaPrefix:attribute";
 					foreach ($aParts as $a => $v) {
 						if ($a == 'ref' || $a == 'type') {
-							$contentStr .= " $a=\"".$this->contractQName($v).'"';
+							$contentStr .= " $a=\"" . $this->contractQName($v) . '"';
 						} elseif ($a == 'http://schemas.xmlsoap.org/wsdl/:arrayType') {
 							$this->usedNamespaces['wsdl'] = $this->namespaces['wsdl'];
-							$contentStr .= ' wsdl:arrayType="'.$this->contractQName($v).'"';
+							$contentStr .= ' wsdl:arrayType="' . $this->contractQName($v) . '"';
 						} else {
 							$contentStr .= " $a=\"$v\"";
 						}
@@ -596,25 +596,25 @@ 
 				}
 			}
 			// if restriction
-			if (isset($attrs['restrictionBase']) && $attrs['restrictionBase'] != ''){
-				$contentStr = "   <$schemaPrefix:restriction base=\"".$this->contractQName($attrs['restrictionBase'])."\">\n".$contentStr."   </$schemaPrefix:restriction>\n";
+			if (isset($attrs['restrictionBase']) && $attrs['restrictionBase'] != '') {
+				$contentStr = "   <$schemaPrefix:restriction base=\"" . $this->contractQName($attrs['restrictionBase']) . "\">\n" . $contentStr . "   </$schemaPrefix:restriction>\n";
 				// complex or simple content
-				if ((isset($attrs['elements']) && count($attrs['elements']) > 0) || (isset($attrs['attrs']) && count($attrs['attrs']) > 0)){
-					$contentStr = "  <$schemaPrefix:complexContent>\n".$contentStr."  </$schemaPrefix:complexContent>\n";
+				if ((isset($attrs['elements']) && count($attrs['elements']) > 0) || (isset($attrs['attrs']) && count($attrs['attrs']) > 0)) {
+					$contentStr = "  <$schemaPrefix:complexContent>\n" . $contentStr . "  </$schemaPrefix:complexContent>\n";
 				}
 			}
 			// finalize complex type
-			if($contentStr != ''){
-				$contentStr = " <$schemaPrefix:complexType name=\"$typeName\">\n".$contentStr." </$schemaPrefix:complexType>\n";
+			if ($contentStr != '') {
+				$contentStr = " <$schemaPrefix:complexType name=\"$typeName\">\n" . $contentStr . " </$schemaPrefix:complexType>\n";
 			} else {
 				$contentStr = " <$schemaPrefix:complexType name=\"$typeName\"/>\n";
 			}
 			$xml .= $contentStr;
 		}
 		// simple types
-		if(isset($this->simpleTypes) && count($this->simpleTypes) > 0){
-			foreach($this->simpleTypes as $typeName => $eParts){
-				$xml .= " <$schemaPrefix:simpleType name=\"$typeName\">\n  <$schemaPrefix:restriction base=\"".$this->contractQName($eParts['type'])."\">\n";
+		if (isset($this->simpleTypes) && count($this->simpleTypes) > 0) {
+			foreach ($this->simpleTypes as $typeName => $eParts) {
+				$xml .= " <$schemaPrefix:simpleType name=\"$typeName\">\n  <$schemaPrefix:restriction base=\"" . $this->contractQName($eParts['type']) . "\">\n";
 				if (isset($eParts['enumeration'])) {
 					foreach ($eParts['enumeration'] as $e) {
 						$xml .= "  <$schemaPrefix:enumeration value=\"$e\"/>\n";
@@ -624,15 +624,15 @@ 
 			}
 		}
 		// elements
-		if(isset($this->elements) && count($this->elements) > 0){
-			foreach($this->elements as $element => $eParts){
-				$xml .= " <$schemaPrefix:element name=\"$element\" type=\"".$this->contractQName($eParts['type'])."\"/>\n";
+		if (isset($this->elements) && count($this->elements) > 0) {
+			foreach ($this->elements as $element => $eParts) {
+				$xml .= " <$schemaPrefix:element name=\"$element\" type=\"" . $this->contractQName($eParts['type']) . "\"/>\n";
 			}
 		}
 		// attributes
-		if(isset($this->attributes) && count($this->attributes) > 0){
-			foreach($this->attributes as $attr => $aParts){
-				$xml .= " <$schemaPrefix:attribute name=\"$attr\" type=\"".$this->contractQName($aParts['type'])."\"\n/>";
+		if (isset($this->attributes) && count($this->attributes) > 0) {
+			foreach ($this->attributes as $attr => $aParts) {
+				$xml .= " <$schemaPrefix:attribute name=\"$attr\" type=\"" . $this->contractQName($aParts['type']) . "\"\n/>";
 			}
 		}
 		// finish 'er up
@@ -646,7 +646,7 @@ 
 		foreach (array_diff($this->usedNamespaces, $this->enclosingNamespaces) as $nsp => $ns) {
 			$el .= " xmlns:$nsp=\"$ns\"";
 		}
-		$xml = $el . ">\n".$xml."</$schemaPrefix:schema>\n";
+		$xml = $el . ">\n" . $xml . "</$schemaPrefix:schema>\n";
 		return $xml;
 	}
 
@@ -656,8 +656,8 @@ 
 	* @param    string $string debug data
 	* @access   private
 	*/
-	public function xdebug($string){
-		$this->debug('<' . $this->schemaTargetNamespace . '> '.$string);
+	public function xdebug($string) {
+		$this->debug('<' . $this->schemaTargetNamespace . '> ' . $string);
 	}
 
     /**
@@ -672,11 +672,11 @@ 
     * @access public
     * @deprecated
     */
-	public function getPHPType($type,$ns){
-		if(isset($this->typemap[$ns][$type])){
+	public function getPHPType($type, $ns) {
+		if (isset($this->typemap[$ns][$type])) {
 			//print "found type '$type' and ns $ns in typemap<br>";
 			return $this->typemap[$ns][$type];
-		} elseif(isset($this->complexTypes[$type])){
+		} elseif (isset($this->complexTypes[$type])) {
 			//print "getting type '$type' and ns $ns from complexTypes array<br>";
 			return $this->complexTypes[$type]['phpType'];
 		}
@@ -705,7 +705,7 @@ 
     * @see addSimpleType
     * @see addElement
     */
-	public function getTypeDef($type){
+	public function getTypeDef($type) {
 		if (substr($type, -1) == '^') {
 			$is_element = 1;
 			$type = substr($type, 0, -1);
@@ -713,10 +713,10 @@ 
 			$is_element = 0;
 		}
 
-		if((! $is_element) && isset($this->complexTypes[$type])){
+		if ((!$is_element) && isset($this->complexTypes[$type])) {
 			$this->xdebug("in getTypeDef, found complexType $type");
 			return $this->complexTypes[$type];
-		} elseif((! $is_element) && isset($this->simpleTypes[$type])){
+		} elseif ((!$is_element) && isset($this->simpleTypes[$type])) {
 			$this->xdebug("in getTypeDef, found simpleType $type");
 			if (!isset($this->simpleTypes[$type]['phpType'])) {
 				// get info for type to tack onto the simple type
@@ -736,7 +736,7 @@ 
 				}
 			}
 			return $this->simpleTypes[$type];
-		} elseif(isset($this->elements[$type])){
+		} elseif (isset($this->elements[$type])) {
 			$this->xdebug("in getTypeDef, found element $type");
 			if (!isset($this->elements[$type]['phpType'])) {
 				// get info for type to tack onto the element
@@ -761,7 +761,7 @@ 
 				}
 			}
 			return $this->elements[$type];
-		} elseif(isset($this->attributes[$type])){
+		} elseif (isset($this->attributes[$type])) {
 			$this->xdebug("in getTypeDef, found attribute $type");
 			return $this->attributes[$type];
 		} elseif (preg_match('/_ContainedType$/', $type)) {
@@ -783,23 +783,23 @@ 
     * @access public
     * @deprecated
     */
-    function serializeTypeDef($type){
+    function serializeTypeDef($type) {
     	//print "in sTD() for type $type<br>";
-	if($typeDef = $this->getTypeDef($type)){
-		$str .= '<'.$type;
-	    if(is_array($typeDef['attrs'])){
-		foreach($typeDef['attrs'] as $attName => $data){
-		    $str .= " $attName=\"{type = ".$data['type']."}\"";
+	if ($typeDef = $this->getTypeDef($type)) {
+		$str .= '<' . $type;
+	    if (is_array($typeDef['attrs'])) {
+		foreach ($typeDef['attrs'] as $attName => $data) {
+		    $str .= " $attName=\"{type = " . $data['type'] . "}\"";
 		}
 	    }
-	    $str .= " xmlns=\"".$this->schema['targetNamespace']."\"";
-	    if(count($typeDef['elements']) > 0){
+	    $str .= " xmlns=\"" . $this->schema['targetNamespace'] . "\"";
+	    if (count($typeDef['elements']) > 0) {
 		$str .= ">";
-		foreach($typeDef['elements'] as $element => $eData){
+		foreach ($typeDef['elements'] as $element => $eData) {
 		    $str .= $this->serializeTypeDef($element);
 		}
 		$str .= "</$type>";
-	    } elseif($typeDef['typeClass'] == 'element') {
+	    } elseif ($typeDef['typeClass'] == 'element') {
 		$str .= "></$type>";
 	    } else {
 		$str .= "/>";
@@ -819,25 +819,25 @@ 
     * @access public
     * @deprecated
 	*/
-	public function typeToForm($name,$type){
+	public function typeToForm($name, $type) {
 		// get typedef
-		if($typeDef = $this->getTypeDef($type)){
+		if ($typeDef = $this->getTypeDef($type)) {
 			// if struct
-			if($typeDef['phpType'] == 'struct'){
+			if ($typeDef['phpType'] == 'struct') {
 				$buffer .= '<table>';
-				foreach($typeDef['elements'] as $child => $childDef){
+				foreach ($typeDef['elements'] as $child => $childDef) {
 					$buffer .= "
-					<tr><td align='right'>$childDef[name] (type: ".$this->getLocalPart($childDef['type'])."):</td>
-					<td><input type='text' name='parameters[".$name."][$childDef[name]]'></td></tr>";
+					<tr><td align='right'>$childDef[name] (type: " . $this->getLocalPart($childDef['type']) . "):</td>
+					<td><input type='text' name='parameters[".$name . "][$childDef[name]]'></td></tr>";
 				}
 				$buffer .= '</table>';
 			// if array
-			} elseif($typeDef['phpType'] == 'array'){
+			} elseif ($typeDef['phpType'] == 'array') {
 				$buffer .= '<table>';
-				for($i=0;$i < 3; $i++){
+				for ($i = 0; $i < 3; $i++) {
 					$buffer .= "
 					<tr><td align='right'>array item (type: $typeDef[arrayType]):</td>
-					<td><input type='text' name='parameters[".$name."][]'></td></tr>";
+					<td><input type='text' name='parameters[" . $name . "][]'></td></tr>";
 				}
 				$buffer .= '</table>';
 			// if scalar
@@ -891,7 +891,7 @@ 
 	* @access public
 	* @see getTypeDef
 	*/
-	public function addComplexType($name,$typeClass='complexType',$phpType='array',$compositor='',$restrictionBase='',$elements=array(),$attrs=array(),$arrayType=''){
+	public function addComplexType($name, $typeClass = 'complexType', $phpType = 'array', $compositor = '', $restrictionBase = '', $elements = array(), $attrs = array(), $arrayType = '') {
 		$this->complexTypes[$name] = array(
 	    'name'		=> $name,
 	    'typeClass'	=> $typeClass,
@@ -919,7 +919,7 @@ 
 	* @see nusoap_xmlschema
 	* @see getTypeDef
 	*/
-	public function addSimpleType($name, $restrictionBase='', $typeClass='simpleType', $phpType='scalar', $enumeration=array()) {
+	public function addSimpleType($name, $restrictionBase = '', $typeClass = 'simpleType', $phpType = 'scalar', $enumeration = array()) {
 		$this->simpleTypes[$name] = array(
 	    'name'			=> $name,
 	    'typeClass'		=> $typeClass,
@@ -940,14 +940,14 @@ 
 	* @access public
 	*/
 	public function addElement($attrs) {
-		if (! $this->getPrefix($attrs['type'])) {
+		if (!$this->getPrefix($attrs['type'])) {
 			$attrs['type'] = $this->schemaTargetNamespace . ':' . $attrs['type'];
 		}
-		$this->elements[ $attrs['name'] ] = $attrs;
-		$this->elements[ $attrs['name'] ]['typeClass'] = 'element';
+		$this->elements[$attrs['name']] = $attrs;
+		$this->elements[$attrs['name']]['typeClass'] = 'element';
 		
 		$this->xdebug("addElement " . $attrs['name']);
-		$this->appendDebug($this->varDump($this->elements[ $attrs['name'] ]));
+		$this->appendDebug($this->varDump($this->elements[$attrs['name']]));
 	}
 }
 

libraries/nusoap/nusoap.php

Doc Comments +20 added lines, -16 removed lines

@@ -326,7 +326,7 @@ 
 	/**
 	 * gets the current debug data for this instance
 	 *
-	 * @return   debug data
+	 * @return   string data
 	 * @access   public
 	 */
 	public function &getDebug()
@@ -340,7 +340,7 @@ 
 	 * 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
+	 * @return   string data as an XML comment
 	 * @access   public
 	 */
 	public function &getDebugAsXMLComment()
@@ -375,7 +375,7 @@ 
 	/**
 	 * returns error string if present
 	 *
-	 * @return   mixed error string or false
+	 * @return   string|false error string or false
 	 * @access   public
 	 */
 	public function getError()
@@ -389,7 +389,7 @@ 
 	/**
 	 * sets error string
 	 *
-	 * @return   boolean $string error string
+	 * @return   boolean|null $string error string
 	 * @access   private
 	 */
 	public function setError($str)
@@ -832,7 +832,7 @@ 
 	 * returns false, if not prefixed
 	 *
 	 * @param string $str The prefixed string
-	 * @return mixed The prefix or false if there is no prefix
+	 * @return string|false The prefix or false if there is no prefix
 	 * @access public
 	 */
 	public function getPrefix($str)
@@ -864,7 +864,7 @@ 
 	 * 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
+	 * @return string The prefix, false if the namespace has no prefixes
 	 * @access public
 	 */
 	public function getPrefixFromNamespace($ns)
@@ -933,7 +933,7 @@ 
  *
  * @param    int $timestamp Unix time stamp
  * @param	boolean $utc Whether the time stamp is UTC or local
- * @return	mixed ISO 8601 date string or false
+ * @return	string|false ISO 8601 date string or false
  * @access   public
  */
 function timestamp_to_iso8601($timestamp, $utc = true)
@@ -1073,7 +1073,7 @@ 
 	 * @param string $faultcode (SOAP-ENV:Client | SOAP-ENV:Server)
 	 * @param string $faultactor only used when msg routed between multiple actors
 	 * @param string $faultstring human readable error message
-	 * @param mixed $faultdetail detail, typically a string or array of string
+	 * @param string $faultdetail detail, typically a string or array of string
 	 */
 	public function nusoap_fault($faultcode, $faultactor = '', $faultstring = '', $faultdetail = '')
 	{
@@ -1906,7 +1906,7 @@ 
 	 * returns a sample serialization of a given type, or false if no type by the given name
 	 *
 	 * @param string $type name of type
-	 * @return mixed
+	 * @return string|false
 	 * @access public
 	 * @deprecated
 	 */
@@ -2160,7 +2160,7 @@ 
 	 *
 	 * @param    string $name optional name
 	 * @param    mixed $type optional type name
-	 * @param	mixed $value optional value
+	 * @param	integer $value optional value
 	 * @param	mixed $element_ns optional namespace of value
 	 * @param	mixed $type_ns optional namespace of type
 	 * @param	mixed $attributes associative array of attributes to add to element serialization
@@ -2377,7 +2377,6 @@ 
 	/**
 	 * establish an HTTP connection
 	 *
-	 * @param    integer $timeout set connection timeout in seconds
 	 * @param	integer $response_timeout set response timeout in seconds
 	 * @return	boolean true if connected, false if not
 	 * @access   private
@@ -2944,7 +2943,7 @@ 
 	 *
 	 * @param    string $data message data
 	 * @param	array $cookies cookies to send
-	 * @return	boolean	true if OK, false if problem
+	 * @return	boolean|null	true if OK, false if problem
 	 * @access   private
 	 */
 	public function sendRequest($data, $cookies = NULL)
@@ -3413,6 +3412,10 @@ 
 	/*
 	 * TODO: allow a Set-Cookie string to be parsed into multiple cookies
 	 */
+
+	/**
+	 * @param string $cookie_str
+	 */
 	public function parseCookie($cookie_str)
 	{
 		$cookie_str = str_replace('; ', ';', $cookie_str) . ';';
@@ -4360,7 +4363,7 @@ 
 	 *
 	 * @param	array	$headers	The HTTP headers
 	 * @param	string	$data		unprocessed request data from client
-	 * @return	mixed	value of the message, decoded into a PHP type
+	 * @return	false|null	value of the message, decoded into a PHP type
 	 * @access   private
 	 */
 	public function parseRequest($headers, $data)
@@ -4742,6 +4745,7 @@ 
 	 * fetches the WSDL document and parses it
 	 *
 	 * @access public
+	 * @param string $wsdl
 	 */
 	public function fetchWSDL($wsdl)
 	{
@@ -5539,7 +5543,7 @@ 
 	/**
 	 * serialize the parsed wsdl
 	 *
-	 * @param mixed $debug whether to put debug=1 in endpoint URL
+	 * @param integer $debug whether to put debug=1 in endpoint URL
 	 * @return string serialization of WSDL
 	 * @access public 
 	 */
@@ -5763,7 +5767,7 @@ 
 	 * @param string $direction (input|output)
 	 * @param mixed $parameters parameter value(s)
 	 * @param string $bindingType (soap|soap12)
-	 * @return mixed parameters serialized as XML or false on error (e.g. operation not found)
+	 * @return false|string parameters serialized as XML or false on error (e.g. operation not found)
 	 * @access public
 	 */
 	public function serializeRPCParameters($operation, $direction, $parameters, $bindingType = 'soap')
@@ -5864,7 +5868,7 @@ 
 	 * @param string $operation operation name
 	 * @param string $direction (input|output)
 	 * @param mixed $parameters parameter value(s)
-	 * @return mixed parameters serialized as XML or false on error (e.g. operation not found)
+	 * @return false|string parameters serialized as XML or false on error (e.g. operation not found)
 	 * @access public
 	 * @deprecated
 	 */

Spacing +11 added lines, -13 removed lines

@@ -2235,8 +2235,8 @@ 
 	var $persistentConnection = false;
 	var $ch = false; // cURL handle
 	var $ch_options = array(); // cURL custom options
-	var $use_curl = false;  // force cURL use
-	var $proxy = null;   // proxy information (associative array)
+	var $use_curl = false; // force cURL use
+	var $proxy = null; // proxy information (associative array)
 	var $username = '';
 	var $password = '';
 	var $authtype = '';
@@ -2684,7 +2684,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
@@ -4140,7 +4140,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)) {
@@ -4700,12 +4700,12 @@ 
 	var $timeout = 0;
 	var $response_timeout = 30;
 	var $curl_options = array(); // User-specified cURL options
-	var $use_curl = false;   // whether to always try to use cURL
+	var $use_curl = false; // whether to always try to use cURL
 	// for HTTP authentication
 	var $username = ''; // Username for HTTP authentication
 	var $password = ''; // Password for HTTP authentication
 	var $authtype = ''; // Type of HTTP authentication
-	var $certRequest = array();  // Certificate for HTTP SSL authentication
+	var $certRequest = array(); // Certificate for HTTP SSL authentication
 
 	/**
 	 * constructor
@@ -4821,11 +4821,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']];
 					}
@@ -6369,7 +6367,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']);
@@ -6614,7 +6612,7 @@ 
 	var $root_struct_name = '';
 	var $root_struct_namespace = '';
 	var $root_header = '';
-	var $document = '';   // incoming SOAP body (text)
+	var $document = ''; // incoming SOAP body (text)
 	// determines where in the message we are (envelope,header,body,method)
 	var $status = '';
 	var $position = 0;
@@ -6630,7 +6628,7 @@ 
 	var $depth_array = array();
 	var $debug_flag = true;
 	var $soapresponse = NULL; // parsed SOAP Body
-	var $soapheader = NULL;  // parsed SOAP Header
+	var $soapheader = NULL; // parsed SOAP Header
 	var $responseHeaders = ''; // incoming SOAP headers (text)
 	var $body_position = 0;
 	// for multiref parsing:

Braces +45 added lines, -34 removed lines

@@ -2367,10 +2367,12 @@ 
 	 */
 	public function io_method()
 	{
-		if ($this->use_curl || ($this->scheme == 'https') || ($this->scheme == 'http' && $this->authtype == 'ntlm') || ($this->scheme == 'http' && is_array($this->proxy) && $this->proxy['authtype'] == 'ntlm'))
-			return 'curl';
-		if (($this->scheme == 'http' || $this->scheme == 'ssl') && $this->authtype != 'ntlm' && (!is_array($this->proxy) || $this->proxy['authtype'] != 'ntlm'))
-			return 'socket';
+		if ($this->use_curl || ($this->scheme == 'https') || ($this->scheme == 'http' && $this->authtype == 'ntlm') || ($this->scheme == 'http' && is_array($this->proxy) && $this->proxy['authtype'] == 'ntlm')) {
+					return 'curl';
+		}
+		if (($this->scheme == 'http' || $this->scheme == 'ssl') && $this->authtype != 'ntlm' && (!is_array($this->proxy) || $this->proxy['authtype'] != 'ntlm')) {
+					return 'socket';
+		}
 		return 'unknown';
 	}
 
@@ -2455,30 +2457,36 @@ 
 				return false;
 			}
 			// Avoid warnings when PHP does not have these options
-			if (defined('CURLOPT_CONNECTIONTIMEOUT'))
-				$CURLOPT_CONNECTIONTIMEOUT = CURLOPT_CONNECTIONTIMEOUT;
-			else
-				$CURLOPT_CONNECTIONTIMEOUT = 78;
-			if (defined('CURLOPT_HTTPAUTH'))
-				$CURLOPT_HTTPAUTH = CURLOPT_HTTPAUTH;
-			else
-				$CURLOPT_HTTPAUTH = 107;
-			if (defined('CURLOPT_PROXYAUTH'))
-				$CURLOPT_PROXYAUTH = CURLOPT_PROXYAUTH;
-			else
-				$CURLOPT_PROXYAUTH = 111;
-			if (defined('CURLAUTH_BASIC'))
-				$CURLAUTH_BASIC = CURLAUTH_BASIC;
-			else
-				$CURLAUTH_BASIC = 1;
-			if (defined('CURLAUTH_DIGEST'))
-				$CURLAUTH_DIGEST = CURLAUTH_DIGEST;
-			else
-				$CURLAUTH_DIGEST = 2;
-			if (defined('CURLAUTH_NTLM'))
-				$CURLAUTH_NTLM = CURLAUTH_NTLM;
-			else
-				$CURLAUTH_NTLM = 8;
+			if (defined('CURLOPT_CONNECTIONTIMEOUT')) {
+							$CURLOPT_CONNECTIONTIMEOUT = CURLOPT_CONNECTIONTIMEOUT;
+			} else {
+							$CURLOPT_CONNECTIONTIMEOUT = 78;
+			}
+			if (defined('CURLOPT_HTTPAUTH')) {
+							$CURLOPT_HTTPAUTH = CURLOPT_HTTPAUTH;
+			} else {
+							$CURLOPT_HTTPAUTH = 107;
+			}
+			if (defined('CURLOPT_PROXYAUTH')) {
+							$CURLOPT_PROXYAUTH = CURLOPT_PROXYAUTH;
+			} else {
+							$CURLOPT_PROXYAUTH = 111;
+			}
+			if (defined('CURLAUTH_BASIC')) {
+							$CURLAUTH_BASIC = CURLAUTH_BASIC;
+			} else {
+							$CURLAUTH_BASIC = 1;
+			}
+			if (defined('CURLAUTH_DIGEST')) {
+							$CURLAUTH_DIGEST = CURLAUTH_DIGEST;
+			} else {
+							$CURLAUTH_DIGEST = 2;
+			}
+			if (defined('CURLAUTH_NTLM')) {
+							$CURLAUTH_NTLM = CURLAUTH_NTLM;
+			} else {
+							$CURLAUTH_NTLM = 8;
+			}
 
 			$this->debug('connect using cURL');
 			// init CURL
@@ -2823,8 +2831,9 @@ 
 			'HTTP/1.0 200 Connection established');
 		foreach ($skipHeaders as $hd) {
 			$prefix = substr($data, 0, strlen($hd));
-			if ($prefix == $hd)
-				return true;
+			if ($prefix == $hd) {
+							return true;
+			}
 		}
 
 		return false;
@@ -4732,8 +4741,9 @@ 
 		$this->proxypassword = $proxypassword;
 		$this->timeout = $timeout;
 		$this->response_timeout = $response_timeout;
-		if (is_array($curl_options))
-			$this->curl_options = $curl_options;
+		if (is_array($curl_options)) {
+					$this->curl_options = $curl_options;
+		}
 		$this->use_curl = $use_curl;
 		$this->fetchWSDL($wsdl);
 	}
@@ -6467,8 +6477,9 @@ 
 			$attrs = $eAttrs;
 		}
 
-		if (!is_array($restrictionBase))
-			$restrictionBase = strpos($restrictionBase, ':') ? $this->expandQname($restrictionBase) : $restrictionBase;
+		if (!is_array($restrictionBase)) {
+					$restrictionBase = strpos($restrictionBase, ':') ? $this->expandQname($restrictionBase) : $restrictionBase;
+		}
 		$arrayType = strpos($arrayType, ':') ? $this->expandQname($arrayType) : $arrayType;
 
 		$typens = isset($this->namespaces['types']) ? $this->namespaces['types'] : $this->namespaces['tns'];

libraries/nusoap/nusoapmime.php

Doc Comments +1 added lines, -1 removed lines

@@ -447,7 +447,7 @@
 	*
 	* @param	array	$headers	The HTTP headers
 	* @param	string	$data		unprocessed request data from client
-	* @return	mixed	value of the message, decoded into a PHP type
+	* @return	false|null	value of the message, decoded into a PHP type
 	* @access   private
 	*/
     function parseRequest($headers, $data) {

Indentation +112 added lines, -112 removed lines

@@ -71,20 +71,20 @@ 
 	var $mimeContentType;
 	
 	/**
-	* adds a MIME attachment to the current request.
-	*
-	* If the $data parameter contains an empty string, this method will read
-	* the contents of the file named by the $filename parameter.
-	*
-	* If the $cid parameter is false, this method will generate the cid.
-	*
-	* @param string $data The data of the attachment
-	* @param string $filename The filename of the attachment (default is empty string)
-	* @param string $contenttype The MIME Content-Type of the attachment (default is application/octet-stream)
-	* @param string $cid The content-id (cid) of the attachment (default is false)
-	* @return string The content-id (cid) of the attachment
-	* @access public
-	*/
+	 * adds a MIME attachment to the current request.
+	 *
+	 * If the $data parameter contains an empty string, this method will read
+	 * the contents of the file named by the $filename parameter.
+	 *
+	 * If the $cid parameter is false, this method will generate the cid.
+	 *
+	 * @param string $data The data of the attachment
+	 * @param string $filename The filename of the attachment (default is empty string)
+	 * @param string $contenttype The MIME Content-Type of the attachment (default is application/octet-stream)
+	 * @param string $cid The content-id (cid) of the attachment (default is false)
+	 * @return string The content-id (cid) of the attachment
+	 * @access public
+	 */
 	public function addAttachment($data, $filename = '', $contenttype = 'application/octet-stream', $cid = false) {
 		if (! $cid) {
 			$cid = md5(uniqid(time()));
@@ -101,35 +101,35 @@ 
 	}
 
 	/**
-	* clears the MIME attachments for the current request.
-	*
-	* @access public
-	*/
+	 * clears the MIME attachments for the current request.
+	 *
+	 * @access public
+	 */
 	public function clearAttachments() {
 		$this->requestAttachments = array();
 	}
 
 	/**
-	* gets the MIME attachments from the current response.
-	*
-	* Each array element in the return is an associative array with keys
-	* data, filename, contenttype, cid.  These keys correspond to the parameters
-	* for addAttachment.
-	*
-	* @return array The attachments.
-	* @access public
-	*/
+	 * gets the MIME attachments from the current response.
+	 *
+	 * Each array element in the return is an associative array with keys
+	 * data, filename, contenttype, cid.  These keys correspond to the parameters
+	 * for addAttachment.
+	 *
+	 * @return array The attachments.
+	 * @access public
+	 */
 	public function getAttachments() {
 		return $this->responseAttachments;
 	}
 
 	/**
-	* gets the HTTP body for the current request.
-	*
-	* @param string $soapmsg The SOAP payload
-	* @return string The HTTP body, which includes the SOAP payload
-	* @access private
-	*/
+	 * gets the HTTP body for the current request.
+	 *
+	 * @param string $soapmsg The SOAP payload
+	 * @return string The HTTP body, which includes the SOAP payload
+	 * @access private
+	 */
 	public function getHTTPBody($soapmsg) {
 		if (count($this->requestAttachments) > 0) {
 			$params['content_type'] = 'multipart/related; type="text/xml"';
@@ -182,13 +182,13 @@ 
 	}
 	
 	/**
-	* gets the HTTP content type for the current request.
-	*
-	* Note: getHTTPBody must be called before this.
-	*
-	* @return string the HTTP content type for the current request.
-	* @access private
-	*/
+	 * gets the HTTP content type for the current request.
+	 *
+	 * Note: getHTTPBody must be called before this.
+	 *
+	 * @return string the HTTP content type for the current request.
+	 * @access private
+	 */
 	public function getHTTPContentType() {
 		if (count($this->requestAttachments) > 0) {
 			return $this->mimeContentType;
@@ -197,14 +197,14 @@ 
 	}
 	
 	/**
-	* gets the HTTP content type charset for the current request.
-	* returns false for non-text content types.
-	*
-	* Note: getHTTPBody must be called before this.
-	*
-	* @return string the HTTP content type charset for the current request.
-	* @access private
-	*/
+	 * gets the HTTP content type charset for the current request.
+	 * returns false for non-text content types.
+	 *
+	 * Note: getHTTPBody must be called before this.
+	 *
+	 * @return string the HTTP content type charset for the current request.
+	 * @access private
+	 */
 	public function getHTTPContentTypeCharset() {
 		if (count($this->requestAttachments) > 0) {
 			return false;
@@ -213,14 +213,14 @@ 
 	}
 
 	/**
-	* processes SOAP message returned from server
-	*
-	* @param	array	$headers	The HTTP headers
-	* @param	string	$data		unprocessed response data from server
-	* @return	mixed	value of the message, decoded into a PHP type
-	* @access   private
-	*/
-    function parseResponse($headers, $data) {
+	 * processes SOAP message returned from server
+	 *
+	 * @param	array	$headers	The HTTP headers
+	 * @param	string	$data		unprocessed response data from server
+	 * @return	mixed	value of the message, decoded into a PHP type
+	 * @access   private
+	 */
+	function parseResponse($headers, $data) {
 		$this->debug('Entering parseResponse() for payload of length ' . strlen($data) . ' and type of ' . $headers['content-type']);
 		$this->responseAttachments = array();
 		if (strstr($headers['content-type'], 'multipart/related')) {
@@ -301,20 +301,20 @@ 
 	var $mimeContentType;
 	
 	/**
-	* adds a MIME attachment to the current response.
-	*
-	* If the $data parameter contains an empty string, this method will read
-	* the contents of the file named by the $filename parameter.
-	*
-	* If the $cid parameter is false, this method will generate the cid.
-	*
-	* @param string $data The data of the attachment
-	* @param string $filename The filename of the attachment (default is empty string)
-	* @param string $contenttype The MIME Content-Type of the attachment (default is application/octet-stream)
-	* @param string $cid The content-id (cid) of the attachment (default is false)
-	* @return string The content-id (cid) of the attachment
-	* @access public
-	*/
+	 * adds a MIME attachment to the current response.
+	 *
+	 * If the $data parameter contains an empty string, this method will read
+	 * the contents of the file named by the $filename parameter.
+	 *
+	 * If the $cid parameter is false, this method will generate the cid.
+	 *
+	 * @param string $data The data of the attachment
+	 * @param string $filename The filename of the attachment (default is empty string)
+	 * @param string $contenttype The MIME Content-Type of the attachment (default is application/octet-stream)
+	 * @param string $cid The content-id (cid) of the attachment (default is false)
+	 * @return string The content-id (cid) of the attachment
+	 * @access public
+	 */
 	public function addAttachment($data, $filename = '', $contenttype = 'application/octet-stream', $cid = false) {
 		if (! $cid) {
 			$cid = md5(uniqid(time()));
@@ -331,35 +331,35 @@ 
 	}
 
 	/**
-	* clears the MIME attachments for the current response.
-	*
-	* @access public
-	*/
+	 * clears the MIME attachments for the current response.
+	 *
+	 * @access public
+	 */
 	public function clearAttachments() {
 		$this->responseAttachments = array();
 	}
 
 	/**
-	* gets the MIME attachments from the current request.
-	*
-	* Each array element in the return is an associative array with keys
-	* data, filename, contenttype, cid.  These keys correspond to the parameters
-	* for addAttachment.
-	*
-	* @return array The attachments.
-	* @access public
-	*/
+	 * gets the MIME attachments from the current request.
+	 *
+	 * Each array element in the return is an associative array with keys
+	 * data, filename, contenttype, cid.  These keys correspond to the parameters
+	 * for addAttachment.
+	 *
+	 * @return array The attachments.
+	 * @access public
+	 */
 	public function getAttachments() {
 		return $this->requestAttachments;
 	}
 
 	/**
-	* gets the HTTP body for the current response.
-	*
-	* @param string $soapmsg The SOAP payload
-	* @return string The HTTP body, which includes the SOAP payload
-	* @access private
-	*/
+	 * gets the HTTP body for the current response.
+	 *
+	 * @param string $soapmsg The SOAP payload
+	 * @return string The HTTP body, which includes the SOAP payload
+	 * @access private
+	 */
 	public function getHTTPBody($soapmsg) {
 		if (count($this->responseAttachments) > 0) {
 			$params['content_type'] = 'multipart/related; type="text/xml"';
@@ -412,13 +412,13 @@ 
 	}
 	
 	/**
-	* gets the HTTP content type for the current response.
-	*
-	* Note: getHTTPBody must be called before this.
-	*
-	* @return string the HTTP content type for the current response.
-	* @access private
-	*/
+	 * gets the HTTP content type for the current response.
+	 *
+	 * Note: getHTTPBody must be called before this.
+	 *
+	 * @return string the HTTP content type for the current response.
+	 * @access private
+	 */
 	public function getHTTPContentType() {
 		if (count($this->responseAttachments) > 0) {
 			return $this->mimeContentType;
@@ -427,14 +427,14 @@ 
 	}
 	
 	/**
-	* gets the HTTP content type charset for the current response.
-	* returns false for non-text content types.
-	*
-	* Note: getHTTPBody must be called before this.
-	*
-	* @return string the HTTP content type charset for the current response.
-	* @access private
-	*/
+	 * gets the HTTP content type charset for the current response.
+	 * returns false for non-text content types.
+	 *
+	 * Note: getHTTPBody must be called before this.
+	 *
+	 * @return string the HTTP content type charset for the current response.
+	 * @access private
+	 */
 	public function getHTTPContentTypeCharset() {
 		if (count($this->responseAttachments) > 0) {
 			return false;
@@ -443,14 +443,14 @@ 
 	}
 
 	/**
-	* processes SOAP message received from client
-	*
-	* @param	array	$headers	The HTTP headers
-	* @param	string	$data		unprocessed request data from client
-	* @return	mixed	value of the message, decoded into a PHP type
-	* @access   private
-	*/
-    function parseRequest($headers, $data) {
+	 * processes SOAP message received from client
+	 *
+	 * @param	array	$headers	The HTTP headers
+	 * @param	string	$data		unprocessed request data from client
+	 * @return	mixed	value of the message, decoded into a PHP type
+	 * @access   private
+	 */
+	function parseRequest($headers, $data) {
 		$this->debug('Entering parseRequest() for payload of length ' . strlen($data) . ' and type of ' . $headers['content-type']);
 		$this->requestAttachments = array();
 		if (strstr($headers['content-type'], 'multipart/related')) {

Spacing +2 added lines, -2 removed lines

@@ -86,7 +86,7 @@ 
 	* @access public
 	*/
 	public function addAttachment($data, $filename = '', $contenttype = 'application/octet-stream', $cid = false) {
-		if (! $cid) {
+		if (!$cid) {
 			$cid = md5(uniqid(time()));
 		}
 
@@ -316,7 +316,7 @@ 
 	* @access public
 	*/
 	public function addAttachment($data, $filename = '', $contenttype = 'application/octet-stream', $cid = false) {
-		if (! $cid) {
+		if (!$cid) {
 			$cid = md5(uniqid(time()));
 		}
 

libraries/restler/restler.php

Doc Comments +21 added lines, -4 removed lines

@@ -268,9 +268,9 @@ 
      *
      * All the protected methods that do not start with _ (underscore)
      * will exposed as protected api which will require authentication
-     * @param string $class name of the service class
-     * @param string $basePath optional url prefix for mapping, uses
+     * @param string $base_path optional url prefix for mapping, uses
      * lowercase version of the class name when not specified
+     * @param string $class_name
      * @throws Exception when supplied with invalid class name
      */
     public function addAPIClass($class_name, $base_path = null)
@@ -322,8 +322,8 @@ 
 
     /**
      * Convenience method to respond with an error message
-     * @param int $statusCode http error code
-     * @param string $errorMessage optional custom error message
+     * @param int $status_code http error code
+     * @param string $error_message optional custom error message
      */
     public function handleError($status_code, $error_message = null)
     {
@@ -916,6 +916,10 @@ 
 {
 
 
+    /**
+     * @param integer $http_status_code
+     * @param string $error_message
+     */
     public function __construct($http_status_code, $error_message = null)
     {
         parent::__construct($error_message, $http_status_code);
@@ -1033,12 +1037,14 @@ 
     /**
      * Set the selected MIME type
      * @param string $mime MIME type
+     * @return void
      */
     public function setMIME($mime);
 
 
     /**
      * Get selected MIME type
+     * @return string
      */
     public function getMIME();
 
@@ -1046,6 +1052,7 @@ 
     /**
      * Set the selected file extension
      * @param string $extension file extension
+     * @return void
      */
     public function setExtension($extension);
 
@@ -1349,6 +1356,9 @@ 
     }
 
 
+    /**
+     * @param string[] $lines
+     */
     private function parseLines($lines)
     {
         foreach ($lines as $line) {
@@ -1398,6 +1408,10 @@ 
     }
 
 
+    /**
+     * @param string $param
+     * @param string $value
+     */
     private function setParam($param, $value)
     {
         if ($param == 'param' || $param == 'return') {
@@ -1454,6 +1468,9 @@ 
 //
 // ------------------------------------------------------------------
 
+/**
+ * @param string $php_doc_comment
+ */
 function parse_doc($php_doc_comment)
 {
     $p = new DocParser();

Indentation +1299 added lines, -1299 removed lines

@@ -16,883 +16,883 @@ 
  */
 class Restler
 {
-    // ==================================================================
-    //
-    // Public variables
-    //
-    // ------------------------------------------------------------------
-
-    const VERSION = '2.2.1';
-
-    /**
-     * URL of the currently mapped service
-     * @var string
-     */
-    public $url;
-
-    /**
-     * Http request method of the current request.
-     * Any value between [GET, PUT, POST, DELETE]
-     * @var string
-     */
-    public $request_method;
-
-    /**
-     * Requested data format. Instance of the current format class
-     * which implements the iFormat interface
-     * @var iFormat
-     * @example jsonFormat, xmlFormat, yamlFormat etc
-     */
-    public $request_format;
-
-    /**
-     * Data sent to the service
-     * @var array
-     */
-    public $request_data = array();
-
-    /**
-     * Used in production mode to store the URL Map to disk
-     * @var string
-     */
-    public $cache_dir;
-
-    /**
-     * base directory to locate format and auth files
-     * @var string
-     */
-    public $base_dir;
-
-    /**
-     * Name of an iRespond implementation class
-     * @var string
-     */
-    public $response = 'DefaultResponse';
-
-    /**
-     * Response data format. Instance of the current format class
-     * which implements the iFormat interface
-     * @var iFormat
-     * @example jsonFormat, xmlFormat, yamlFormat etc
-     */
-    public $response_format;
-
-    // ==================================================================
-    //
-    // Private & Protected variables
-    //
-    // ------------------------------------------------------------------
-
-    /**
-     * When set to false, it will run in debug mode and parse the
-     * class files every time to map it to the URL
-     * @var boolean
-     */
-    protected $production_mode;
-
-    /**
-     * Associated array that maps urls to their respective class and method
-     * @var array
-     */
-    protected $routes = array();
-
-    /**
-     * Associated array that maps formats to their respective format class name
-     * @var array
-     */
-    protected $format_map = array();
-
-    /**
-     * Instance of the current api service class
-     * @var object
-     */
-    protected $service_class_instance;
-
-    /**
-     * Name of the api method being called
-     * @var string
-     */
-    protected $service_method;
-
-    /**
-     * list of authentication classes
-     * @var array
-     */
-    protected $auth_classes = array();
-
-    /**
-     * list of error handling classes
-     * @var array
-     */
-    protected $error_classes = array();
-
-    /**
-     * HTTP status codes
-     * @var array
-     */
-    private $codes = array(
-        100 => 'Continue',
-        101 => 'Switching Protocols',
-        200 => 'OK',
-        201 => 'Created',
-        202 => 'Accepted',
-        203 => 'Non-Authoritative Information',
-        204 => 'No Content',
-        205 => 'Reset Content',
-        206 => 'Partial Content',
-        300 => 'Multiple Choices',
-        301 => 'Moved Permanently',
-        302 => 'Found',
-        303 => 'See Other',
-        304 => 'Not Modified',
-        305 => 'Use Proxy',
-        306 => '(Unused)',
-        307 => 'Temporary Redirect',
-        400 => 'Bad Request',
-        401 => 'Unauthorized',
-        402 => 'Payment Required',
-        403 => 'Forbidden',
-        404 => 'Not Found',
-        405 => 'Method Not Allowed',
-        406 => 'Not Acceptable',
-        407 => 'Proxy Authentication Required',
-        408 => 'Request Timeout',
-        409 => 'Conflict',
-        410 => 'Gone',
-        411 => 'Length Required',
-        412 => 'Precondition Failed',
-        413 => 'Request Entity Too Large',
-        414 => 'Request-URI Too Long',
-        415 => 'Unsupported Media Type',
-        416 => 'Requested Range Not Satisfiable',
-        417 => 'Expectation Failed',
-        500 => 'Internal Server Error',
-        501 => 'Not Implemented',
-        502 => 'Bad Gateway',
-        503 => 'Service Unavailable',
-        504 => 'Gateway Timeout',
-        505 => 'HTTP Version Not Supported'
-    );
-
-    /**
-     * Caching of url map is enabled or not
-     * @var boolean
-     */
-    protected $cached;
-
-    // ==================================================================
-    //
-    // Public functions
-    //
-    // ------------------------------------------------------------------
-
-
-    /**
-     * Constructor
-     * @param boolean $production_mode When set to false, it will run in
-     * debug mode and parse the class files every time to map it to the URL
-     */
-    public function __construct($production_mode = false)
-    {
-        $this->production_mode = $production_mode;
-        $this->cache_dir = getcwd();
-        $this->base_dir = RESTLER_PATH;
-    }
-
-
-    /**
-     * Store the url map cache if needed
-     */
-    public function __destruct()
-    {
-        if ($this->production_mode && !($this->cached)) {
-            $this->saveCache();
-        }
-    }
-
-
-    /**
-     * Use it in production mode to refresh the url map cache
-     */
-    public function refreshCache()
-    {
-        $this->routes = array();
-        $this->cached = false;
-    }
-
-
-    /**
-     * Call this method and pass all the formats that should be
-     * supported by the API. Accepts multiple parameters
-     * @param string class name of the format class that implements iFormat
-     * @example $restler->setSupportedFormats('JsonFormat', 'XmlFormat'...);
-     */
-    public function setSupportedFormats()
-    {
-        $args = func_get_args();
-        $extensions = array();
-        foreach ($args as $class_name) {
-            if (!is_string($class_name) || !class_exists($class_name)) {
-                throw new Exception("$class_name is not a vaild Format Class.");
-            }
-            $obj = new $class_name;
-            if (!($obj instanceof iFormat)) {
-                throw new Exception('Invalid format class; must implement '
-                    . 'iFormat interface');
-            }
-            foreach ($obj->getMIMEMap() as $extension => $mime) {
-                if (!isset($this->format_map[$extension])) {
-                    $this->format_map[$extension] = $class_name;
-                }
-                $mime = explode(',', $mime);
-                if (!is_array($mime)) {
-                    $mime = array($mime);
-                }
-                foreach ($mime as $value) {
-                    if (!isset($this->format_map[$value])) {
-                        $this->format_map[$value] = $class_name;
-                    }
-                }
-                $extensions[".$extension"] = true;
-            }
-        }
-        $this->format_map['default'] = $args[0];
-        $this->format_map['extensions'] = array_keys($extensions);
-    }
-
-
-    /**
-     * Add api classes throgh this method. All the public methods
-     * that do not start with _ (underscore) will be  will be exposed
-     * as the public api by default.
-     *
-     * All the protected methods that do not start with _ (underscore)
-     * will exposed as protected api which will require authentication
-     * @param string $class name of the service class
-     * @param string $basePath optional url prefix for mapping, uses
-     * lowercase version of the class name when not specified
-     * @throws Exception when supplied with invalid class name
-     */
-    public function addAPIClass($class_name, $base_path = null)
-    {
-        if (!class_exists($class_name)) {
-            throw new Exception("API class $class_name is missing.");
-        }
-        $this->loadCache();
-        if (!$this->cached) {
-            if (is_null($base_path)) {
-                $base_path = strtolower($class_name);
-                $index = strrpos($class_name, '\\');
-                if ($index !== false) {
-                    $base_path = substr($base_path, $index + 1);
-                }
-            } else {
-                $base_path = trim($base_path, '/');
-            }
-            if (strlen($base_path) > 0) {
-                $base_path .= '/';
-            }
-            $this->generateMap($class_name, $base_path);
-        }
-    }
-
-
-    /**
-     * protected methods will need atleast one authentication class to be set
-     * in order to allow that method to be executed
-     * @param string $class_name of the authentication class
-     * @param string $base_path optional url prefix for mapping
-     */
-    public function addAuthenticationClass($class_name, $base_path = null)
-    {
-        $this->auth_classes[] = $class_name;
-        $this->addAPIClass($class_name, $base_path);
-    }
-
-
-    /**
-     * Add class for custom error handling
-     * @param string $class_name of the error handling class
-     */
-    public function addErrorClass($class_name)
-    {
-        $this->error_classes[] = $class_name;
-    }
-
-
-    /**
-     * Convenience method to respond with an error message
-     * @param int $statusCode http error code
-     * @param string $errorMessage optional custom error message
-     */
-    public function handleError($status_code, $error_message = null)
-    {
-        $method = "handle$status_code";
-        $handled = false;
-        foreach ($this->error_classes as $class_name) {
-            if (method_exists($class_name, $method)) {
-                $obj = new $class_name();
-                $obj->restler = $this;
-                $obj->$method();
-                $handled = true;
-            }
-        }
-        if ($handled) {
-            return;
-        }
-        $message = $this->codes[$status_code]
-            . (!$error_message ? '' : ': ' . $error_message);
-        $this->setStatus($status_code);
-        $responder = new $this->response();
-        $responder->restler = $this;
-        $this->sendData($responder->__formatError($status_code, $message));
-    }
-
-
-    /**
-     * An initialize function to allow use of the restler error generation 
-     * functions for pre-processing and pre-routing of requests.
-     */
-    public function init()
-    {
-        if (empty($this->format_map)) {
-            $this->setSupportedFormats('JsonFormat');
-        }
-        $this->url = $this->getPath();
-        $this->request_method = $this->getRequestMethod();
-        $this->response_format = $this->getResponseFormat();
-        $this->request_format = $this->getRequestFormat();
-        if (is_null($this->request_format)) {
-            $this->request_format = $this->response_format;
-        }
-        if ($this->request_method == 'PUT' || $this->request_method == 'POST') {
-            $this->request_data = $this->getRequestData();
-        }
-    }
-
-
-    /**
-     * Main function for processing the api request
-     * and return the response
-     * @throws Exception when the api service class is missing
-     * @throws RestException to send error response
-     */
-    public function handle()
-    {
-        $this->init();
-        $o = $this->mapUrlToMethod();
-
-        if (!isset($o->class_name)) {
-            $this->handleError(404);
-        } else {
-            try {
-                if ($o->method_flag) {
-                    $auth_method = '__isAuthenticated';
-                    if (!count($this->auth_classes)) {
-                        throw new RestException(401);
-                    }
-                    foreach ($this->auth_classes as $auth_class) {
-                        $auth_obj = new $auth_class();
-                        $auth_obj->restler = $this;
-                        $this->applyClassMetadata($auth_class, $auth_obj, $o);
-                        if (!method_exists($auth_obj, $auth_method)) {
-                            throw new RestException(401, 'Authentication Class '
-                                . 'should implement iAuthenticate');
-                        } else if (!$auth_obj->$auth_method()) {
-                            throw new RestException(401);
-                        }
-                    }
-                }
-                $this->applyClassMetadata(get_class($this->request_format),
-                    $this->request_format, $o);
-                $pre_process = '_' . $this->request_format->getExtension() . '_'
-                    . $o->method_name;
-                $this->service_method = $o->method_name;
-                if ($o->method_flag == 2) {
-                    $o = unprotect($o);
-                }
-                $object = $this->service_class_instance = new $o->class_name();
-                $object->restler = $this;
-                if (method_exists($o->class_name, $pre_process)) {
-                    call_user_func_array(
-                        array($object, $pre_process), $o->arguments
-                    );
-                }
-                switch ($o->method_flag) {
-                    case 3:
-                        $reflection_method = new ReflectionMethod($object,
-                                $o->method_name);
-                        $reflection_method->setAccessible(true);
-                        $result = $reflection_method->invokeArgs($object,
-                            $o->arguments);
-                        break;
-                    case 2:
-                    case 1:
-                    default:
-                        $result = call_user_func_array(array(
-                            $object,
-                            $o->method_name), $o->arguments
-                        );
-                        break;
-                }
-            } catch (RestException $e) {
-                $this->handleError($e->getCode(), $e->getMessage());
-            }
-        }
-        $responder = new $this->response();
-        $responder->restler = $this;
-        $this->applyClassMetadata($this->response, $responder, $o);
-        if (isset($result) && $result !== null) {
-            $result = $responder->__formatResponse($result);
-            $this->sendData($result);
-        }
-    }
-
-
-    /**
-     * Encodes the response in the prefered format
-     * and sends back
-     * @param $data array php data
-     */
-    public function sendData($data)
-    {
-        $data = $this->response_format->encode($data, 
-            !($this->production_mode)
-        );
-        $post_process = '_' . $this->service_method . '_'
-            . $this->response_format->getExtension();
-        if (isset($this->service_class_instance)
-            && method_exists($this->service_class_instance, $post_process)
-        ) {
-            $data = call_user_func(array($this->service_class_instance,
-                $post_process), $data);
-        }
-        header("Cache-Control: no-cache, must-revalidate");
-        header("Expires: 0");
-        header('Content-Type: ' . $this->response_format->getMIME());
-        //.'; charset=utf-8');
-        header("X-Powered-By: Luracast Restler v" . Restler::VERSION);
+	// ==================================================================
+	//
+	// Public variables
+	//
+	// ------------------------------------------------------------------
+
+	const VERSION = '2.2.1';
+
+	/**
+	 * URL of the currently mapped service
+	 * @var string
+	 */
+	public $url;
+
+	/**
+	 * Http request method of the current request.
+	 * Any value between [GET, PUT, POST, DELETE]
+	 * @var string
+	 */
+	public $request_method;
+
+	/**
+	 * Requested data format. Instance of the current format class
+	 * which implements the iFormat interface
+	 * @var iFormat
+	 * @example jsonFormat, xmlFormat, yamlFormat etc
+	 */
+	public $request_format;
+
+	/**
+	 * Data sent to the service
+	 * @var array
+	 */
+	public $request_data = array();
+
+	/**
+	 * Used in production mode to store the URL Map to disk
+	 * @var string
+	 */
+	public $cache_dir;
+
+	/**
+	 * base directory to locate format and auth files
+	 * @var string
+	 */
+	public $base_dir;
+
+	/**
+	 * Name of an iRespond implementation class
+	 * @var string
+	 */
+	public $response = 'DefaultResponse';
+
+	/**
+	 * Response data format. Instance of the current format class
+	 * which implements the iFormat interface
+	 * @var iFormat
+	 * @example jsonFormat, xmlFormat, yamlFormat etc
+	 */
+	public $response_format;
+
+	// ==================================================================
+	//
+	// Private & Protected variables
+	//
+	// ------------------------------------------------------------------
+
+	/**
+	 * When set to false, it will run in debug mode and parse the
+	 * class files every time to map it to the URL
+	 * @var boolean
+	 */
+	protected $production_mode;
+
+	/**
+	 * Associated array that maps urls to their respective class and method
+	 * @var array
+	 */
+	protected $routes = array();
+
+	/**
+	 * Associated array that maps formats to their respective format class name
+	 * @var array
+	 */
+	protected $format_map = array();
+
+	/**
+	 * Instance of the current api service class
+	 * @var object
+	 */
+	protected $service_class_instance;
+
+	/**
+	 * Name of the api method being called
+	 * @var string
+	 */
+	protected $service_method;
+
+	/**
+	 * list of authentication classes
+	 * @var array
+	 */
+	protected $auth_classes = array();
+
+	/**
+	 * list of error handling classes
+	 * @var array
+	 */
+	protected $error_classes = array();
+
+	/**
+	 * HTTP status codes
+	 * @var array
+	 */
+	private $codes = array(
+		100 => 'Continue',
+		101 => 'Switching Protocols',
+		200 => 'OK',
+		201 => 'Created',
+		202 => 'Accepted',
+		203 => 'Non-Authoritative Information',
+		204 => 'No Content',
+		205 => 'Reset Content',
+		206 => 'Partial Content',
+		300 => 'Multiple Choices',
+		301 => 'Moved Permanently',
+		302 => 'Found',
+		303 => 'See Other',
+		304 => 'Not Modified',
+		305 => 'Use Proxy',
+		306 => '(Unused)',
+		307 => 'Temporary Redirect',
+		400 => 'Bad Request',
+		401 => 'Unauthorized',
+		402 => 'Payment Required',
+		403 => 'Forbidden',
+		404 => 'Not Found',
+		405 => 'Method Not Allowed',
+		406 => 'Not Acceptable',
+		407 => 'Proxy Authentication Required',
+		408 => 'Request Timeout',
+		409 => 'Conflict',
+		410 => 'Gone',
+		411 => 'Length Required',
+		412 => 'Precondition Failed',
+		413 => 'Request Entity Too Large',
+		414 => 'Request-URI Too Long',
+		415 => 'Unsupported Media Type',
+		416 => 'Requested Range Not Satisfiable',
+		417 => 'Expectation Failed',
+		500 => 'Internal Server Error',
+		501 => 'Not Implemented',
+		502 => 'Bad Gateway',
+		503 => 'Service Unavailable',
+		504 => 'Gateway Timeout',
+		505 => 'HTTP Version Not Supported'
+	);
+
+	/**
+	 * Caching of url map is enabled or not
+	 * @var boolean
+	 */
+	protected $cached;
+
+	// ==================================================================
+	//
+	// Public functions
+	//
+	// ------------------------------------------------------------------
+
+
+	/**
+	 * Constructor
+	 * @param boolean $production_mode When set to false, it will run in
+	 * debug mode and parse the class files every time to map it to the URL
+	 */
+	public function __construct($production_mode = false)
+	{
+		$this->production_mode = $production_mode;
+		$this->cache_dir = getcwd();
+		$this->base_dir = RESTLER_PATH;
+	}
+
+
+	/**
+	 * Store the url map cache if needed
+	 */
+	public function __destruct()
+	{
+		if ($this->production_mode && !($this->cached)) {
+			$this->saveCache();
+		}
+	}
+
+
+	/**
+	 * Use it in production mode to refresh the url map cache
+	 */
+	public function refreshCache()
+	{
+		$this->routes = array();
+		$this->cached = false;
+	}
+
+
+	/**
+	 * Call this method and pass all the formats that should be
+	 * supported by the API. Accepts multiple parameters
+	 * @param string class name of the format class that implements iFormat
+	 * @example $restler->setSupportedFormats('JsonFormat', 'XmlFormat'...);
+	 */
+	public function setSupportedFormats()
+	{
+		$args = func_get_args();
+		$extensions = array();
+		foreach ($args as $class_name) {
+			if (!is_string($class_name) || !class_exists($class_name)) {
+				throw new Exception("$class_name is not a vaild Format Class.");
+			}
+			$obj = new $class_name;
+			if (!($obj instanceof iFormat)) {
+				throw new Exception('Invalid format class; must implement '
+					. 'iFormat interface');
+			}
+			foreach ($obj->getMIMEMap() as $extension => $mime) {
+				if (!isset($this->format_map[$extension])) {
+					$this->format_map[$extension] = $class_name;
+				}
+				$mime = explode(',', $mime);
+				if (!is_array($mime)) {
+					$mime = array($mime);
+				}
+				foreach ($mime as $value) {
+					if (!isset($this->format_map[$value])) {
+						$this->format_map[$value] = $class_name;
+					}
+				}
+				$extensions[".$extension"] = true;
+			}
+		}
+		$this->format_map['default'] = $args[0];
+		$this->format_map['extensions'] = array_keys($extensions);
+	}
+
+
+	/**
+	 * Add api classes throgh this method. All the public methods
+	 * that do not start with _ (underscore) will be  will be exposed
+	 * as the public api by default.
+	 *
+	 * All the protected methods that do not start with _ (underscore)
+	 * will exposed as protected api which will require authentication
+	 * @param string $class name of the service class
+	 * @param string $basePath optional url prefix for mapping, uses
+	 * lowercase version of the class name when not specified
+	 * @throws Exception when supplied with invalid class name
+	 */
+	public function addAPIClass($class_name, $base_path = null)
+	{
+		if (!class_exists($class_name)) {
+			throw new Exception("API class $class_name is missing.");
+		}
+		$this->loadCache();
+		if (!$this->cached) {
+			if (is_null($base_path)) {
+				$base_path = strtolower($class_name);
+				$index = strrpos($class_name, '\\');
+				if ($index !== false) {
+					$base_path = substr($base_path, $index + 1);
+				}
+			} else {
+				$base_path = trim($base_path, '/');
+			}
+			if (strlen($base_path) > 0) {
+				$base_path .= '/';
+			}
+			$this->generateMap($class_name, $base_path);
+		}
+	}
+
+
+	/**
+	 * protected methods will need atleast one authentication class to be set
+	 * in order to allow that method to be executed
+	 * @param string $class_name of the authentication class
+	 * @param string $base_path optional url prefix for mapping
+	 */
+	public function addAuthenticationClass($class_name, $base_path = null)
+	{
+		$this->auth_classes[] = $class_name;
+		$this->addAPIClass($class_name, $base_path);
+	}
+
+
+	/**
+	 * Add class for custom error handling
+	 * @param string $class_name of the error handling class
+	 */
+	public function addErrorClass($class_name)
+	{
+		$this->error_classes[] = $class_name;
+	}
+
+
+	/**
+	 * Convenience method to respond with an error message
+	 * @param int $statusCode http error code
+	 * @param string $errorMessage optional custom error message
+	 */
+	public function handleError($status_code, $error_message = null)
+	{
+		$method = "handle$status_code";
+		$handled = false;
+		foreach ($this->error_classes as $class_name) {
+			if (method_exists($class_name, $method)) {
+				$obj = new $class_name();
+				$obj->restler = $this;
+				$obj->$method();
+				$handled = true;
+			}
+		}
+		if ($handled) {
+			return;
+		}
+		$message = $this->codes[$status_code]
+			. (!$error_message ? '' : ': ' . $error_message);
+		$this->setStatus($status_code);
+		$responder = new $this->response();
+		$responder->restler = $this;
+		$this->sendData($responder->__formatError($status_code, $message));
+	}
+
+
+	/**
+	 * An initialize function to allow use of the restler error generation 
+	 * functions for pre-processing and pre-routing of requests.
+	 */
+	public function init()
+	{
+		if (empty($this->format_map)) {
+			$this->setSupportedFormats('JsonFormat');
+		}
+		$this->url = $this->getPath();
+		$this->request_method = $this->getRequestMethod();
+		$this->response_format = $this->getResponseFormat();
+		$this->request_format = $this->getRequestFormat();
+		if (is_null($this->request_format)) {
+			$this->request_format = $this->response_format;
+		}
+		if ($this->request_method == 'PUT' || $this->request_method == 'POST') {
+			$this->request_data = $this->getRequestData();
+		}
+	}
+
+
+	/**
+	 * Main function for processing the api request
+	 * and return the response
+	 * @throws Exception when the api service class is missing
+	 * @throws RestException to send error response
+	 */
+	public function handle()
+	{
+		$this->init();
+		$o = $this->mapUrlToMethod();
+
+		if (!isset($o->class_name)) {
+			$this->handleError(404);
+		} else {
+			try {
+				if ($o->method_flag) {
+					$auth_method = '__isAuthenticated';
+					if (!count($this->auth_classes)) {
+						throw new RestException(401);
+					}
+					foreach ($this->auth_classes as $auth_class) {
+						$auth_obj = new $auth_class();
+						$auth_obj->restler = $this;
+						$this->applyClassMetadata($auth_class, $auth_obj, $o);
+						if (!method_exists($auth_obj, $auth_method)) {
+							throw new RestException(401, 'Authentication Class '
+								. 'should implement iAuthenticate');
+						} else if (!$auth_obj->$auth_method()) {
+							throw new RestException(401);
+						}
+					}
+				}
+				$this->applyClassMetadata(get_class($this->request_format),
+					$this->request_format, $o);
+				$pre_process = '_' . $this->request_format->getExtension() . '_'
+					. $o->method_name;
+				$this->service_method = $o->method_name;
+				if ($o->method_flag == 2) {
+					$o = unprotect($o);
+				}
+				$object = $this->service_class_instance = new $o->class_name();
+				$object->restler = $this;
+				if (method_exists($o->class_name, $pre_process)) {
+					call_user_func_array(
+						array($object, $pre_process), $o->arguments
+					);
+				}
+				switch ($o->method_flag) {
+					case 3:
+						$reflection_method = new ReflectionMethod($object,
+								$o->method_name);
+						$reflection_method->setAccessible(true);
+						$result = $reflection_method->invokeArgs($object,
+							$o->arguments);
+						break;
+					case 2:
+					case 1:
+					default:
+						$result = call_user_func_array(array(
+							$object,
+							$o->method_name), $o->arguments
+						);
+						break;
+				}
+			} catch (RestException $e) {
+				$this->handleError($e->getCode(), $e->getMessage());
+			}
+		}
+		$responder = new $this->response();
+		$responder->restler = $this;
+		$this->applyClassMetadata($this->response, $responder, $o);
+		if (isset($result) && $result !== null) {
+			$result = $responder->__formatResponse($result);
+			$this->sendData($result);
+		}
+	}
+
+
+	/**
+	 * Encodes the response in the prefered format
+	 * and sends back
+	 * @param $data array php data
+	 */
+	public function sendData($data)
+	{
+		$data = $this->response_format->encode($data, 
+			!($this->production_mode)
+		);
+		$post_process = '_' . $this->service_method . '_'
+			. $this->response_format->getExtension();
+		if (isset($this->service_class_instance)
+			&& method_exists($this->service_class_instance, $post_process)
+		) {
+			$data = call_user_func(array($this->service_class_instance,
+				$post_process), $data);
+		}
+		header("Cache-Control: no-cache, must-revalidate");
+		header("Expires: 0");
+		header('Content-Type: ' . $this->response_format->getMIME());
+		//.'; charset=utf-8');
+		header("X-Powered-By: Luracast Restler v" . Restler::VERSION);
 		if($this->production_mode){
 			die($data);
 		}else{
 			echo $data;
 		}
-    }
-
-
-    /**
-     * Sets the HTTP response status
-     * @param int $code response code
-     */
-    public function setStatus($code)
-    {
-        header("{$_SERVER['SERVER_PROTOCOL']} $code " . 
-            $this->codes[strval($code)]);
-    }
-
-
-    /**
-     * Compare two strings and remove the common
-     * sub string from the first string and return it
-     * @param string $first
-     * @param string $second
-     * @param string $char optional, set it as
-     * blank string for char by char comparison
-     * @return string
-     */
-    public function removeCommonPath($first, $second, $char = '/')
-    {
-        $first = explode($char, $first);
-        $second = explode($char, $second);
-        while (count($second)) {
-            if ($first[0] == $second[0]) {
-                array_shift($first);
-            } else {
-                break;
-            }
-            array_shift($second);
-        }
-        return implode($char, $first);
-    }
-
-
-    /**
-     * Save cache to file
-     */
-    public function saveCache()
-    {
-        $file = $this->cache_dir . '/routes.php';
-        $s = '$o=array();' . PHP_EOL;
-        foreach ($this->routes as $key => $value) {
-            $s .= PHP_EOL . PHP_EOL . PHP_EOL . 
-                "############### $key ###############" . PHP_EOL . PHP_EOL;
-            $s .= '$o[\'' . $key . '\']=array();';
-            foreach ($value as $ke => $va) {
-                $s .= PHP_EOL . PHP_EOL . "#==== $key $ke" . PHP_EOL . PHP_EOL;
-                $s .= '$o[\'' . $key . '\'][\'' . $ke . '\']=' . str_replace(
-                        PHP_EOL, PHP_EOL . "\t", var_export($va, true)
-                    ) . ';';
-            }
-        }
-        $s .= PHP_EOL . 'return $o;';
-        $r = @file_put_contents($file, "<?php $s");
-        @chmod($file, 0777);
-        if ($r === false) {
-            throw new Exception(
-                "The cache directory located at '$this->cache_dir' needs to "
-                . "have the permissions set to read/write/execute for everyone"
-                . " in order to save cache and improve performance.");
-        }
-    }
-
-    // ==================================================================
-    //
-    // Protected functions
-    //
-    // ------------------------------------------------------------------
-
-
-    /**
-     * Parses the requst url and get the api path
-     * @return string api path
-     */
-    protected function getPath()
-    {
-        $path = urldecode($this->removeCommonPath($_SERVER['REQUEST_URI'],
-                $_SERVER['SCRIPT_NAME']));
-        $path = preg_replace('/(\/*\?.*$)|(\/$)/', '', $path);
-        $path = str_replace($this->format_map['extensions'], '', $path);
-        return $path;
-    }
-
-
-    /**
-     * Parses the request to figure out the http request type
-     * @return string which will be one of the following
-     * [GET, POST, PUT, DELETE]
-     * @example GET
-     */
-    protected function getRequestMethod()
-    {
-        $method = $_SERVER['REQUEST_METHOD'];
-        if (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])) {
-            $method = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'];
-        }
-        //support for HEAD request
-        if ($method == 'HEAD') {
-            $method = 'GET';
-        }
-        return $method;
-    }
-
-
-    /**
-     * Parses the request to figure out format of the request data
-     * @return iFormat any class that implements iFormat
-     * @example JsonFormat
-     */
-    protected function getRequestFormat()
-    {
-        $format = null;
-        //check if client has sent any information on request format
-        if (isset($_SERVER['CONTENT_TYPE'])) {
-            $mime = explode(';', $_SERVER['CONTENT_TYPE']);
-            $mime = $mime[0];
-            if ($mime == UrlEncodedFormat::MIME) {
-                $format = new UrlEncodedFormat();
-            } else {
-                if (isset($this->format_map[$mime])) {
-                    $format = $this->format_map[$mime];
-                    $format = is_string($format) ? new $format : $format;
-                    $format->setMIME($mime);
-                }
-            }
-        }
-        return $format;
-    }
-
-
-    /**
-     * Parses the request to figure out the best format for response
-     * @return iFormat any class that implements iFormat
-     * @example JsonFormat
-     */
-    protected function getResponseFormat()
-    {
-        //check if client has specified an extension
-        /**
-         * @var iFormat
-         */
-        $format = null;
-        $extensions = explode('.',
-            parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH));
-        while ($extensions) {
-            $extension = array_pop($extensions);
-            $extension = explode('/', $extension);
-            $extension = array_shift($extension);
-            if ($extension && isset($this->format_map[$extension])) {
-                $format = $this->format_map[$extension];
-                $format = is_string($format) ? new $format : $format;
-                $format->setExtension($extension);
-                //echo "Extension $extension";
-                return $format;
-            }
-        }
-        //check if client has sent list of accepted data formats
-        if (isset($_SERVER['HTTP_ACCEPT'])) {
-            $acceptList = array();
-            $accepts = explode(',', strtolower($_SERVER['HTTP_ACCEPT']));
-            if (!is_array($accepts)) {
-                $accepts = array($accepts);
-            }
-            foreach ($accepts as $pos => $accept) {
-                $parts = explode(';q=', trim($accept));
-                $type = array_shift($parts);
-                $quality = count($parts) ? 
-                    floatval(array_shift($parts)) : 
-                    (1000 - $pos) / 1000;
-                $acceptList[$type] = $quality;
-            }
-            arsort($acceptList);
-            foreach ($acceptList as $accept => $quality) {
-                if (isset($this->format_map[$accept])) {
-                    $format = $this->format_map[$accept];
-                    $format = is_string($format) ? new $format : $format;
-                    $format->setMIME($accept);
-                    //echo "MIME $accept";
-                    // Tell cache content is based on Accept header
-                    header("Vary: Accept"); 
-                    return $format;
-                }
-            }
-        } else {
-            // RFC 2616: If no Accept header field is
-            // present, then it is assumed that the
-            // client accepts all media types.
-            $_SERVER['HTTP_ACCEPT'] = '*/*';
-        }
-        if (strpos($_SERVER['HTTP_ACCEPT'], '*') !== false) {
-            if (strpos($_SERVER['HTTP_ACCEPT'], 'application/*') !== false) {
-                $format = new JsonFormat;
-            } else if (strpos($_SERVER['HTTP_ACCEPT'], 'text/*') !== false) {
-                $format = new XmlFormat;
-            } else if (strpos($_SERVER['HTTP_ACCEPT'], '*/*') !== false) {
-                $format = new $this->format_map['default'];
-            }
-        }
-        if (empty($format)) {
-            // RFC 2616: If an Accept header field is present, and if the 
-            // server cannot send a response which is acceptable according to 
-            // the combined Accept field value, then the server SHOULD send 
-            // a 406 (not acceptable) response.
-            header('HTTP/1.1 406 Not Acceptable');
-            die('406 Not Acceptable: The server was unable to ' . 
-                    'negotiate content for this request.');
-        } else {
-            // Tell cache content is based ot Accept header
-            header("Vary: Accept"); 
-            return $format;
-        }
-    }
-
-
-    /**
-     * Parses the request data and returns it
-     * @return array php data
-     */
-    protected function getRequestData()
-    {
-        try {
-            $r = file_get_contents('php://input');
-            if (is_null($r)) {
-                return $_GET;
-            }
-            $r = $this->request_format->decode($r);
-            return is_null($r) ? array() : $r;
-        } catch (RestException $e) {
-            $this->handleError($e->getCode(), $e->getMessage());
-        }
-    }
-
-
-    protected function mapUrlToMethod()
-    {
-        if (!isset($this->routes[$this->request_method])) {
-            return array();
-        }
-        $urls = $this->routes[$this->request_method];
-        if (!$urls) {
-            return array();
-        }
-
-        $found = false;
-        $this->request_data += $_GET;
-        $params = array('request_data' => $this->request_data);
-        $params += $this->request_data;
-        $lc = strtolower($this->url);
-        foreach ($urls as $url => $call) {
-            //echo PHP_EOL.$url.' = '.$this->url.PHP_EOL;
-            $call = (object) $call;
-            if (strstr($url, ':')) {
-                $regex = preg_replace('/\\\:([^\/]+)/', '(?P<$1>[^/]+)',
-                    preg_quote($url));
-                if (preg_match(":^$regex$:i", $this->url, $matches)) {
-                    foreach ($matches as $arg => $match) {
-                        if (isset($call->arguments[$arg])) {
-                            //flog("$arg => $match $args[$arg]");
-                            $params[$arg] = $match;
-                        }
-                    }
-                    $found = true;
-                    break;
-                }
-            } else if ($url == $lc) {
-                $found = true;
-                break;
-            }
-        }
-        if ($found) {
-            //echo PHP_EOL."Found $url ";
-            //print_r($call);
-            $p = $call->defaults;
-            foreach ($call->arguments as $key => $value) {
-                //echo "$key => $value \n";
-                if (isset($params[$key])) {
-                    $p[$value] = $params[$key];
-                }
-            }
-            $call->arguments = $p;
-            return $call;
-        }
-    }
-
-
-    /**
-     * Apply static and non-static properties defined in
-     * the method information anotation
-     * @param String $class_name
-     * @param Object $instance instance of that class
-     * @param Object $method_info method information and metadata
-     */
-    protected function applyClassMetadata($class_name, $instance, $method_info)
-    {
-        if (isset($method_info->metadata[$class_name])
-            && is_array($method_info->metadata[$class_name])
-        ) {
-            foreach ($method_info->metadata[$class_name] as
-                    $property => $value) {
-                if (property_exists($class_name, $property)) {
-                    $reflection_property = 
-                        new ReflectionProperty($class_name, $property);
-                    $reflection_property->setValue($instance, $value);
-                }
-            }
-        }
-    }
-
-
-    protected function loadCache()
-    {
-        if ($this->cached !== null) {
-            return;
-        }
-        $file = $this->cache_dir . '/routes.php';
-        $this->cached = false;
-
-        if ($this->production_mode) {
-            if (file_exists($file)) {
-                $routes = include($file);
-            }
-            if (isset($routes) && is_array($routes)) {
-                $this->routes = $routes;
-                $this->cached = true;
-            }
-        } else {
-            //@unlink($this->cache_dir . "/$name.php");
-        }
-    }
-
-
-    /**
-     * Generates cachable url to method mapping
-     * @param string $class_name
-     * @param string $base_path
-     */
-    protected function generateMap($class_name, $base_path = '')
-    {
-        $reflection = new ReflectionClass($class_name);
-        $class_metadata = parse_doc($reflection->getDocComment());
-        $methods = $reflection->getMethods(
-            ReflectionMethod::IS_PUBLIC + ReflectionMethod::IS_PROTECTED
-        );
-        foreach ($methods as $method) {
-            $doc = $method->getDocComment();
-            $arguments = array();
-            $defaults = array();
-            $metadata = $class_metadata + parse_doc($doc);
-            $params = $method->getParameters();
-            $position = 0;
-            foreach ($params as $param) {
-                $arguments[$param->getName()] = $position;
-                $defaults[$position] = $param->isDefaultValueAvailable() ? 
-                    $param->getDefaultValue() : null;
-                $position++;
-            }
-            $method_flag = $method->isProtected() ? 
-                (isRestlerCompatibilityModeEnabled() ? 2 : 3) : 
-                (isset($metadata['protected']) ? 1 : 0);
-
-            //take note of the order
-            $call = array(
-                'class_name' => $class_name,
-                'method_name' => $method->getName(),
-                'arguments' => $arguments,
-                'defaults' => $defaults,
-                'metadata' => $metadata,
-                'method_flag' => $method_flag
-            );
-            $method_url = strtolower($method->getName());
-            if (preg_match_all(
-                '/@url\s+(GET|POST|PUT|DELETE|HEAD|OPTIONS)[ \t]*\/?(\S*)/s',
-                    $doc, $matches, PREG_SET_ORDER)
-            ) {
-                foreach ($matches as $match) {
-                    $http_method = $match[1];
-                    $url = rtrim($base_path . $match[2], '/');
-                    $this->routes[$http_method][$url] = $call;
-                }
-            } elseif ($method_url[0] != '_') { 
-                //not prefixed with underscore
-                // no configuration found so use convention
-                if (preg_match_all('/^(GET|POST|PUT|DELETE|HEAD|OPTIONS)/i',
-                        $method_url, $matches)
-                ) {
-                    $http_method = strtoupper($matches[0][0]);
-                    $method_url = substr($method_url, strlen($http_method));
-                } else {
-                    $http_method = 'GET';
-                }
-                $url = $base_path
-                    . ($method_url == 'index' || $method_url == 'default' ? '' :
-                        $method_url);
-                $url = rtrim($url, '/');
-                $this->routes[$http_method][$url] = $call;
-                foreach ($params as $param) {
-                    if ($param->getName() == 'request_data') {
-                        break;
-                    }
-                    $url .= $url == '' ? ':' : '/:';
-                    $url .= $param->getName();
-                    $this->routes[$http_method][$url] = $call;
-                }
-            }
-        }
-    }
+	}
+
+
+	/**
+	 * Sets the HTTP response status
+	 * @param int $code response code
+	 */
+	public function setStatus($code)
+	{
+		header("{$_SERVER['SERVER_PROTOCOL']} $code " . 
+			$this->codes[strval($code)]);
+	}
+
+
+	/**
+	 * Compare two strings and remove the common
+	 * sub string from the first string and return it
+	 * @param string $first
+	 * @param string $second
+	 * @param string $char optional, set it as
+	 * blank string for char by char comparison
+	 * @return string
+	 */
+	public function removeCommonPath($first, $second, $char = '/')
+	{
+		$first = explode($char, $first);
+		$second = explode($char, $second);
+		while (count($second)) {
+			if ($first[0] == $second[0]) {
+				array_shift($first);
+			} else {
+				break;
+			}
+			array_shift($second);
+		}
+		return implode($char, $first);
+	}
+
+
+	/**
+	 * Save cache to file
+	 */
+	public function saveCache()
+	{
+		$file = $this->cache_dir . '/routes.php';
+		$s = '$o=array();' . PHP_EOL;
+		foreach ($this->routes as $key => $value) {
+			$s .= PHP_EOL . PHP_EOL . PHP_EOL . 
+				"############### $key ###############" . PHP_EOL . PHP_EOL;
+			$s .= '$o[\'' . $key . '\']=array();';
+			foreach ($value as $ke => $va) {
+				$s .= PHP_EOL . PHP_EOL . "#==== $key $ke" . PHP_EOL . PHP_EOL;
+				$s .= '$o[\'' . $key . '\'][\'' . $ke . '\']=' . str_replace(
+						PHP_EOL, PHP_EOL . "\t", var_export($va, true)
+					) . ';';
+			}
+		}
+		$s .= PHP_EOL . 'return $o;';
+		$r = @file_put_contents($file, "<?php $s");
+		@chmod($file, 0777);
+		if ($r === false) {
+			throw new Exception(
+				"The cache directory located at '$this->cache_dir' needs to "
+				. "have the permissions set to read/write/execute for everyone"
+				. " in order to save cache and improve performance.");
+		}
+	}
+
+	// ==================================================================
+	//
+	// Protected functions
+	//
+	// ------------------------------------------------------------------
+
+
+	/**
+	 * Parses the requst url and get the api path
+	 * @return string api path
+	 */
+	protected function getPath()
+	{
+		$path = urldecode($this->removeCommonPath($_SERVER['REQUEST_URI'],
+				$_SERVER['SCRIPT_NAME']));
+		$path = preg_replace('/(\/*\?.*$)|(\/$)/', '', $path);
+		$path = str_replace($this->format_map['extensions'], '', $path);
+		return $path;
+	}
+
+
+	/**
+	 * Parses the request to figure out the http request type
+	 * @return string which will be one of the following
+	 * [GET, POST, PUT, DELETE]
+	 * @example GET
+	 */
+	protected function getRequestMethod()
+	{
+		$method = $_SERVER['REQUEST_METHOD'];
+		if (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])) {
+			$method = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'];
+		}
+		//support for HEAD request
+		if ($method == 'HEAD') {
+			$method = 'GET';
+		}
+		return $method;
+	}
+
+
+	/**
+	 * Parses the request to figure out format of the request data
+	 * @return iFormat any class that implements iFormat
+	 * @example JsonFormat
+	 */
+	protected function getRequestFormat()
+	{
+		$format = null;
+		//check if client has sent any information on request format
+		if (isset($_SERVER['CONTENT_TYPE'])) {
+			$mime = explode(';', $_SERVER['CONTENT_TYPE']);
+			$mime = $mime[0];
+			if ($mime == UrlEncodedFormat::MIME) {
+				$format = new UrlEncodedFormat();
+			} else {
+				if (isset($this->format_map[$mime])) {
+					$format = $this->format_map[$mime];
+					$format = is_string($format) ? new $format : $format;
+					$format->setMIME($mime);
+				}
+			}
+		}
+		return $format;
+	}
+
+
+	/**
+	 * Parses the request to figure out the best format for response
+	 * @return iFormat any class that implements iFormat
+	 * @example JsonFormat
+	 */
+	protected function getResponseFormat()
+	{
+		//check if client has specified an extension
+		/**
+		 * @var iFormat
+		 */
+		$format = null;
+		$extensions = explode('.',
+			parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH));
+		while ($extensions) {
+			$extension = array_pop($extensions);
+			$extension = explode('/', $extension);
+			$extension = array_shift($extension);
+			if ($extension && isset($this->format_map[$extension])) {
+				$format = $this->format_map[$extension];
+				$format = is_string($format) ? new $format : $format;
+				$format->setExtension($extension);
+				//echo "Extension $extension";
+				return $format;
+			}
+		}
+		//check if client has sent list of accepted data formats
+		if (isset($_SERVER['HTTP_ACCEPT'])) {
+			$acceptList = array();
+			$accepts = explode(',', strtolower($_SERVER['HTTP_ACCEPT']));
+			if (!is_array($accepts)) {
+				$accepts = array($accepts);
+			}
+			foreach ($accepts as $pos => $accept) {
+				$parts = explode(';q=', trim($accept));
+				$type = array_shift($parts);
+				$quality = count($parts) ? 
+					floatval(array_shift($parts)) : 
+					(1000 - $pos) / 1000;
+				$acceptList[$type] = $quality;
+			}
+			arsort($acceptList);
+			foreach ($acceptList as $accept => $quality) {
+				if (isset($this->format_map[$accept])) {
+					$format = $this->format_map[$accept];
+					$format = is_string($format) ? new $format : $format;
+					$format->setMIME($accept);
+					//echo "MIME $accept";
+					// Tell cache content is based on Accept header
+					header("Vary: Accept"); 
+					return $format;
+				}
+			}
+		} else {
+			// RFC 2616: If no Accept header field is
+			// present, then it is assumed that the
+			// client accepts all media types.
+			$_SERVER['HTTP_ACCEPT'] = '*/*';
+		}
+		if (strpos($_SERVER['HTTP_ACCEPT'], '*') !== false) {
+			if (strpos($_SERVER['HTTP_ACCEPT'], 'application/*') !== false) {
+				$format = new JsonFormat;
+			} else if (strpos($_SERVER['HTTP_ACCEPT'], 'text/*') !== false) {
+				$format = new XmlFormat;
+			} else if (strpos($_SERVER['HTTP_ACCEPT'], '*/*') !== false) {
+				$format = new $this->format_map['default'];
+			}
+		}
+		if (empty($format)) {
+			// RFC 2616: If an Accept header field is present, and if the 
+			// server cannot send a response which is acceptable according to 
+			// the combined Accept field value, then the server SHOULD send 
+			// a 406 (not acceptable) response.
+			header('HTTP/1.1 406 Not Acceptable');
+			die('406 Not Acceptable: The server was unable to ' . 
+					'negotiate content for this request.');
+		} else {
+			// Tell cache content is based ot Accept header
+			header("Vary: Accept"); 
+			return $format;
+		}
+	}
+
+
+	/**
+	 * Parses the request data and returns it
+	 * @return array php data
+	 */
+	protected function getRequestData()
+	{
+		try {
+			$r = file_get_contents('php://input');
+			if (is_null($r)) {
+				return $_GET;
+			}
+			$r = $this->request_format->decode($r);
+			return is_null($r) ? array() : $r;
+		} catch (RestException $e) {
+			$this->handleError($e->getCode(), $e->getMessage());
+		}
+	}
+
+
+	protected function mapUrlToMethod()
+	{
+		if (!isset($this->routes[$this->request_method])) {
+			return array();
+		}
+		$urls = $this->routes[$this->request_method];
+		if (!$urls) {
+			return array();
+		}
+
+		$found = false;
+		$this->request_data += $_GET;
+		$params = array('request_data' => $this->request_data);
+		$params += $this->request_data;
+		$lc = strtolower($this->url);
+		foreach ($urls as $url => $call) {
+			//echo PHP_EOL.$url.' = '.$this->url.PHP_EOL;
+			$call = (object) $call;
+			if (strstr($url, ':')) {
+				$regex = preg_replace('/\\\:([^\/]+)/', '(?P<$1>[^/]+)',
+					preg_quote($url));
+				if (preg_match(":^$regex$:i", $this->url, $matches)) {
+					foreach ($matches as $arg => $match) {
+						if (isset($call->arguments[$arg])) {
+							//flog("$arg => $match $args[$arg]");
+							$params[$arg] = $match;
+						}
+					}
+					$found = true;
+					break;
+				}
+			} else if ($url == $lc) {
+				$found = true;
+				break;
+			}
+		}
+		if ($found) {
+			//echo PHP_EOL."Found $url ";
+			//print_r($call);
+			$p = $call->defaults;
+			foreach ($call->arguments as $key => $value) {
+				//echo "$key => $value \n";
+				if (isset($params[$key])) {
+					$p[$value] = $params[$key];
+				}
+			}
+			$call->arguments = $p;
+			return $call;
+		}
+	}
+
+
+	/**
+	 * Apply static and non-static properties defined in
+	 * the method information anotation
+	 * @param String $class_name
+	 * @param Object $instance instance of that class
+	 * @param Object $method_info method information and metadata
+	 */
+	protected function applyClassMetadata($class_name, $instance, $method_info)
+	{
+		if (isset($method_info->metadata[$class_name])
+			&& is_array($method_info->metadata[$class_name])
+		) {
+			foreach ($method_info->metadata[$class_name] as
+					$property => $value) {
+				if (property_exists($class_name, $property)) {
+					$reflection_property = 
+						new ReflectionProperty($class_name, $property);
+					$reflection_property->setValue($instance, $value);
+				}
+			}
+		}
+	}
+
+
+	protected function loadCache()
+	{
+		if ($this->cached !== null) {
+			return;
+		}
+		$file = $this->cache_dir . '/routes.php';
+		$this->cached = false;
+
+		if ($this->production_mode) {
+			if (file_exists($file)) {
+				$routes = include($file);
+			}
+			if (isset($routes) && is_array($routes)) {
+				$this->routes = $routes;
+				$this->cached = true;
+			}
+		} else {
+			//@unlink($this->cache_dir . "/$name.php");
+		}
+	}
+
+
+	/**
+	 * Generates cachable url to method mapping
+	 * @param string $class_name
+	 * @param string $base_path
+	 */
+	protected function generateMap($class_name, $base_path = '')
+	{
+		$reflection = new ReflectionClass($class_name);
+		$class_metadata = parse_doc($reflection->getDocComment());
+		$methods = $reflection->getMethods(
+			ReflectionMethod::IS_PUBLIC + ReflectionMethod::IS_PROTECTED
+		);
+		foreach ($methods as $method) {
+			$doc = $method->getDocComment();
+			$arguments = array();
+			$defaults = array();
+			$metadata = $class_metadata + parse_doc($doc);
+			$params = $method->getParameters();
+			$position = 0;
+			foreach ($params as $param) {
+				$arguments[$param->getName()] = $position;
+				$defaults[$position] = $param->isDefaultValueAvailable() ? 
+					$param->getDefaultValue() : null;
+				$position++;
+			}
+			$method_flag = $method->isProtected() ? 
+				(isRestlerCompatibilityModeEnabled() ? 2 : 3) : 
+				(isset($metadata['protected']) ? 1 : 0);
+
+			//take note of the order
+			$call = array(
+				'class_name' => $class_name,
+				'method_name' => $method->getName(),
+				'arguments' => $arguments,
+				'defaults' => $defaults,
+				'metadata' => $metadata,
+				'method_flag' => $method_flag
+			);
+			$method_url = strtolower($method->getName());
+			if (preg_match_all(
+				'/@url\s+(GET|POST|PUT|DELETE|HEAD|OPTIONS)[ \t]*\/?(\S*)/s',
+					$doc, $matches, PREG_SET_ORDER)
+			) {
+				foreach ($matches as $match) {
+					$http_method = $match[1];
+					$url = rtrim($base_path . $match[2], '/');
+					$this->routes[$http_method][$url] = $call;
+				}
+			} elseif ($method_url[0] != '_') { 
+				//not prefixed with underscore
+				// no configuration found so use convention
+				if (preg_match_all('/^(GET|POST|PUT|DELETE|HEAD|OPTIONS)/i',
+						$method_url, $matches)
+				) {
+					$http_method = strtoupper($matches[0][0]);
+					$method_url = substr($method_url, strlen($http_method));
+				} else {
+					$http_method = 'GET';
+				}
+				$url = $base_path
+					. ($method_url == 'index' || $method_url == 'default' ? '' :
+						$method_url);
+				$url = rtrim($url, '/');
+				$this->routes[$http_method][$url] = $call;
+				foreach ($params as $param) {
+					if ($param->getName() == 'request_data') {
+						break;
+					}
+					$url .= $url == '' ? ':' : '/:';
+					$url .= $param->getName();
+					$this->routes[$http_method][$url] = $call;
+				}
+			}
+		}
+	}
 
 }
 
 if (version_compare(PHP_VERSION, '5.3.0') < 0) {
-    require_once 'compat.php';
+	require_once 'compat.php';
 }
 
 // ==================================================================
@@ -916,10 +916,10 @@ 
 {
 
 
-    public function __construct($http_status_code, $error_message = null)
-    {
-        parent::__construct($error_message, $http_status_code);
-    }
+	public function __construct($http_status_code, $error_message = null)
+	{
+		parent::__construct($error_message, $http_status_code);
+	}
 
 }
 
@@ -937,21 +937,21 @@ 
 {
 
 
-    /**
-     * Result of an api call is passed to this method
-     * to create a standard structure for the data
-     * @param unknown_type $result can be a primitive or array or object
-     */
-    public function __formatResponse($result);
+	/**
+	 * Result of an api call is passed to this method
+	 * to create a standard structure for the data
+	 * @param unknown_type $result can be a primitive or array or object
+	 */
+	public function __formatResponse($result);
 
 
-    /**
-     * When the api call results in RestException this method
-     * will be called to return the error message
-     * @param int $status_code
-     * @param String $message
-     */
-    public function __formatError($status_code, $message);
+	/**
+	 * When the api call results in RestException this method
+	 * will be called to return the error message
+	 * @param int $status_code
+	 * @param String $message
+	 */
+	public function __formatError($status_code, $message);
 }
 
 /**
@@ -968,21 +968,21 @@ 
 {
 
 
-    function __formatResponse($result)
-    {
-        return $result;
-    }
+	function __formatResponse($result)
+	{
+		return $result;
+	}
 
 
-    function __formatError($statusCode, $message)
-    {
-        return array(
-            'error' => array(
-                'code' => $statusCode,
-                'message' => $message
-            )
-        );
-    }
+	function __formatError($statusCode, $message)
+	{
+		return array(
+			'error' => array(
+				'code' => $statusCode,
+				'message' => $message
+			)
+		);
+	}
 
 }
 
@@ -1000,11 +1000,11 @@ 
 {
 
 
-    /**
-     * Auth function that is called when a protected method is requested
-     * @return boolean true or false
-     */
-    public function __isAuthenticated();
+	/**
+	 * Auth function that is called when a protected method is requested
+	 * @return boolean true or false
+	 */
+	public function __isAuthenticated();
 }
 
 /**
@@ -1022,60 +1022,60 @@ 
 {
 
 
-    /**
-     * Get Extension => MIME type mappings as an associative array
-     * @return array list of mime strings for the format
-     * @example array('json'=>'application/json');
-     */
-    public function getMIMEMap();
+	/**
+	 * Get Extension => MIME type mappings as an associative array
+	 * @return array list of mime strings for the format
+	 * @example array('json'=>'application/json');
+	 */
+	public function getMIMEMap();
 
 
-    /**
-     * Set the selected MIME type
-     * @param string $mime MIME type
-     */
-    public function setMIME($mime);
+	/**
+	 * Set the selected MIME type
+	 * @param string $mime MIME type
+	 */
+	public function setMIME($mime);
 
 
-    /**
-     * Get selected MIME type
-     */
-    public function getMIME();
+	/**
+	 * Get selected MIME type
+	 */
+	public function getMIME();
 
 
-    /**
-     * Set the selected file extension
-     * @param string $extension file extension
-     */
-    public function setExtension($extension);
+	/**
+	 * Set the selected file extension
+	 * @param string $extension file extension
+	 */
+	public function setExtension($extension);
 
 
-    /**
-     * Get the selected file extension
-     * @return string file extension
-     */
-    public function getExtension();
+	/**
+	 * Get the selected file extension
+	 * @return string file extension
+	 */
+	public function getExtension();
 
 
-    /**
-     * Encode the given data in the format
-     * @param array $data resulting data that needs to
-     * be encoded in the given format
-     * @param boolean $human_readable set to true when restler
-     * is not running in production mode. Formatter has to
-     * make the encoded output more human readable
-     * @return string encoded string
-     */
-    public function encode($data, $human_readable = false);
+	/**
+	 * Encode the given data in the format
+	 * @param array $data resulting data that needs to
+	 * be encoded in the given format
+	 * @param boolean $human_readable set to true when restler
+	 * is not running in production mode. Formatter has to
+	 * make the encoded output more human readable
+	 * @return string encoded string
+	 */
+	public function encode($data, $human_readable = false);
 
 
-    /**
-     * Decode the given data from the format
-     * @param string $data data sent from client to
-     * the api in the given format.
-     * @return array associative array of the parsed data
-     */
-    public function decode($data);
+	/**
+	 * Decode the given data from the format
+	 * @param string $data data sent from client to
+	 * the api in the given format.
+	 * @return array associative array of the parsed data
+	 */
+	public function decode($data);
 }
 
 /**
@@ -1091,57 +1091,57 @@ 
 class UrlEncodedFormat implements iFormat
 {
 
-    const MIME = 'application/x-www-form-urlencoded';
-    const EXTENSION = 'post';
+	const MIME = 'application/x-www-form-urlencoded';
+	const EXTENSION = 'post';
 
 
-    public function getMIMEMap()
-    {
-        return array(self::EXTENSION => self::MIME);
-    }
+	public function getMIMEMap()
+	{
+		return array(self::EXTENSION => self::MIME);
+	}
 
 
-    public function getMIME()
-    {
-        return self::MIME;
-    }
+	public function getMIME()
+	{
+		return self::MIME;
+	}
 
 
-    public function getExtension()
-    {
-        return self::EXTENSION;
-    }
+	public function getExtension()
+	{
+		return self::EXTENSION;
+	}
 
 
-    public function setMIME($mime)
-    {
-        //do nothing
-    }
+	public function setMIME($mime)
+	{
+		//do nothing
+	}
 
 
-    public function setExtension($extension)
-    {
-        //do nothing
-    }
+	public function setExtension($extension)
+	{
+		//do nothing
+	}
 
 
-    public function encode($data, $human_readable = false)
-    {
-        return http_build_query($data);
-    }
+	public function encode($data, $human_readable = false)
+	{
+		return http_build_query($data);
+	}
 
 
-    public function decode($data)
-    {
-        parse_str($data, $r);
-        return $r;
-    }
+	public function decode($data)
+	{
+		parse_str($data, $r);
+		return $r;
+	}
 
 
-    public function __toString()
-    {
-        return $this->getExtension();
-    }
+	public function __toString()
+	{
+		return $this->getExtension();
+	}
 
 }
 
@@ -1158,158 +1158,158 @@ 
 class JsonFormat implements iFormat
 {
 
-    const MIME = 'application/json,application/javascript';
-
-    static $mime = 'application/json';
-
-    const EXTENSION = 'json';
-
-
-    public function getMIMEMap()
-    {
-        return array(self::EXTENSION => self::MIME);
-    }
-
-
-    public function getMIME()
-    {
-        return self::$mime;
-    }
-
-
-    public function getExtension()
-    {
-        return self::EXTENSION;
-    }
-
-
-    public function setMIME($mime)
-    {
-        self::$mime = $mime;
-    }
-
-
-    public function setExtension($extension)
-    {
-        //do nothing
-    }
-
-
-    public function encode($data, $human_readable = false)
-    {
-        return $human_readable ? 
-            $this->json_format(json_encode(object_to_array($data))) : 
-            json_encode(object_to_array($data));
-    }
-
-
-    public function decode($data)
-    {
-        $decoded = json_decode($data);
-        if (function_exists('json_last_error')) {
-            $message = '';
-            switch (json_last_error()) {
-                case JSON_ERROR_NONE:
-                    return object_to_array($decoded);
-                    break;
-                case JSON_ERROR_DEPTH:
-                    $message = 'maximum stack depth exceeded';
-                    break;
-                case JSON_ERROR_STATE_MISMATCH:
-                    $message = 'underflow or the modes mismatch';
-                    break;
-                case JSON_ERROR_CTRL_CHAR:
-                    $message = 'unexpected control character found';
-                    break;
-                case JSON_ERROR_SYNTAX:
-                    $message = 'malformed JSON';
-                    break;
-                case JSON_ERROR_UTF8:
-                    $message = 'malformed UTF-8 characters, '.
-                        'possibly incorrectly encoded';
-                    break;
-                default:
-                    $message = 'unknown error';
-                    break;
-            }
-            throw new RestException(400, 'Error parsing JSON, ' . $message);
-        } else if (strlen($data) && $decoded === null || $decoded === $data) {
-            throw new RestException(400, 'Error parsing JSON');
-        }
-        return object_to_array($decoded);
-    }
-
-
-    /**
-     * Pretty print JSON string
-     * @param string $json
-     * @return string formated json
-     */
-    private function json_format($json)
-    {
-        $tab = "  ";
-        $new_json = "";
-        $indent_level = 0;
-        $in_string = false;
-        $len = strlen($json);
-
-        for ($c = 0; $c < $len; $c++) {
-            $char = $json[$c];
-            switch ($char) {
-                case '{':
-                case '[':
-                    if (!$in_string) {
-                        $new_json .= $char . "\n" .
-                            str_repeat($tab, $indent_level + 1);
-                        $indent_level++;
-                    } else {
-                        $new_json .= $char;
-                    }
-                    break;
-                case '}':
-                case ']':
-                    if (!$in_string) {
-                        $indent_level--;
-                        $new_json .= "\n" . str_repeat($tab, $indent_level) 
-                            . $char;
-                    } else {
-                        $new_json .= $char;
-                    }
-                    break;
-                case ',':
-                    if (!$in_string) {
-                        $new_json .= ",\n" . str_repeat($tab, $indent_level);
-                    } else {
-                        $new_json .= $char;
-                    }
-                    break;
-                case ':':
-                    if (!$in_string) {
-                        $new_json .= ": ";
-                    } else {
-                        $new_json .= $char;
-                    }
-                    break;
-                case '"':
-                    if ($c == 0) {
-                        $in_string = true;
-                    } else if ($c > 0 && $json[$c - 1] != '\\') {
-                        $in_string = !$in_string;
-                    }
-                default:
-                    $new_json .= $char;
-                    break;
-            }
-        }
-
-        return $new_json;
-    }
-
-
-    public function __toString()
-    {
-        return $this->getExtension();
-    }
+	const MIME = 'application/json,application/javascript';
+
+	static $mime = 'application/json';
+
+	const EXTENSION = 'json';
+
+
+	public function getMIMEMap()
+	{
+		return array(self::EXTENSION => self::MIME);
+	}
+
+
+	public function getMIME()
+	{
+		return self::$mime;
+	}
+
+
+	public function getExtension()
+	{
+		return self::EXTENSION;
+	}
+
+
+	public function setMIME($mime)
+	{
+		self::$mime = $mime;
+	}
+
+
+	public function setExtension($extension)
+	{
+		//do nothing
+	}
+
+
+	public function encode($data, $human_readable = false)
+	{
+		return $human_readable ? 
+			$this->json_format(json_encode(object_to_array($data))) : 
+			json_encode(object_to_array($data));
+	}
+
+
+	public function decode($data)
+	{
+		$decoded = json_decode($data);
+		if (function_exists('json_last_error')) {
+			$message = '';
+			switch (json_last_error()) {
+				case JSON_ERROR_NONE:
+					return object_to_array($decoded);
+					break;
+				case JSON_ERROR_DEPTH:
+					$message = 'maximum stack depth exceeded';
+					break;
+				case JSON_ERROR_STATE_MISMATCH:
+					$message = 'underflow or the modes mismatch';
+					break;
+				case JSON_ERROR_CTRL_CHAR:
+					$message = 'unexpected control character found';
+					break;
+				case JSON_ERROR_SYNTAX:
+					$message = 'malformed JSON';
+					break;
+				case JSON_ERROR_UTF8:
+					$message = 'malformed UTF-8 characters, '.
+						'possibly incorrectly encoded';
+					break;
+				default:
+					$message = 'unknown error';
+					break;
+			}
+			throw new RestException(400, 'Error parsing JSON, ' . $message);
+		} else if (strlen($data) && $decoded === null || $decoded === $data) {
+			throw new RestException(400, 'Error parsing JSON');
+		}
+		return object_to_array($decoded);
+	}
+
+
+	/**
+	 * Pretty print JSON string
+	 * @param string $json
+	 * @return string formated json
+	 */
+	private function json_format($json)
+	{
+		$tab = "  ";
+		$new_json = "";
+		$indent_level = 0;
+		$in_string = false;
+		$len = strlen($json);
+
+		for ($c = 0; $c < $len; $c++) {
+			$char = $json[$c];
+			switch ($char) {
+				case '{':
+				case '[':
+					if (!$in_string) {
+						$new_json .= $char . "\n" .
+							str_repeat($tab, $indent_level + 1);
+						$indent_level++;
+					} else {
+						$new_json .= $char;
+					}
+					break;
+				case '}':
+				case ']':
+					if (!$in_string) {
+						$indent_level--;
+						$new_json .= "\n" . str_repeat($tab, $indent_level) 
+							. $char;
+					} else {
+						$new_json .= $char;
+					}
+					break;
+				case ',':
+					if (!$in_string) {
+						$new_json .= ",\n" . str_repeat($tab, $indent_level);
+					} else {
+						$new_json .= $char;
+					}
+					break;
+				case ':':
+					if (!$in_string) {
+						$new_json .= ": ";
+					} else {
+						$new_json .= $char;
+					}
+					break;
+				case '"':
+					if ($c == 0) {
+						$in_string = true;
+					} else if ($c > 0 && $json[$c - 1] != '\\') {
+						$in_string = !$in_string;
+					}
+				default:
+					$new_json .= $char;
+					break;
+			}
+		}
+
+		return $new_json;
+	}
+
+
+	public function __toString()
+	{
+		return $this->getExtension();
+	}
 
 }
 
@@ -1327,123 +1327,123 @@ 
 class DocParser
 {
 
-    private $params = array();
-
-
-    function parse($doc = '')
-    {
-        if ($doc == '') {
-            return $this->params;
-        }
-        //Get the comment
-        if (preg_match('#^/\*\*(.*)\*/#s', $doc, $comment) === false) {
-            return $this->params;
-        }
-        $comment = trim($comment[1]);
-        //Get all the lines and strip the * from the first character
-        if (preg_match_all('#^\s*\*(.*)#m', $comment, $lines) === false) {
-            return $this->params;
-        }
-        $this->parseLines($lines[1]);
-        return $this->params;
-    }
-
-
-    private function parseLines($lines)
-    {
-        foreach ($lines as $line) {
-            $parsedLine = $this->parseLine($line); //Parse the line
-
-            if ($parsedLine === false && !isset($this->params['description'])) {
-                if (isset($desc)) {
-                    //Store the first line in the short description
-                    $this->params['description'] = implode(PHP_EOL, $desc);
-                }
-                $desc = array();
-            } else if ($parsedLine !== false) {
-                $desc[] = $parsedLine; //Store the line in the long description
-            }
-        }
-        $desc = implode(' ', $desc);
-        if (!empty($desc)) {
-            $this->params['long_description'] = $desc;
-        }
-    }
-
-
-    private function parseLine($line)
-    {
-        //trim the whitespace from the line
-        $line = trim($line);
-
-        if (empty($line)) {
-            return false; //Empty line
-        }
-
-        if (strpos($line, '@') === 0) {
-            if (strpos($line, ' ') > 0) {
-                //Get the parameter name
-                $param = substr($line, 1, strpos($line, ' ') - 1);
-                $value = substr($line, strlen($param) + 2); //Get the value
-            } else {
-                $param = substr($line, 1);
-                $value = '';
-            }
-            //Parse the line and return false if the parameter is valid
-            if ($this->setParam($param, $value)) {
-                return false;
-            }
-        }
-        return $line;
-    }
-
-
-    private function setParam($param, $value)
-    {
-        if ($param == 'param' || $param == 'return') {
-            $value = $this->formatParamOrReturn($value);
-        }
-        if ($param == 'class') {
-            list($param, $value) = $this->formatClass($value);
-        }
-
-        if (empty($this->params[$param])) {
-            $this->params[$param] = $value;
-        } else if ($param == 'param') {
-            $arr = array($this->params[$param], $value);
-            $this->params[$param] = $arr;
-        } else {
-            $this->params[$param] = $value + $this->params[$param];
-        }
-        return true;
-    }
-
-
-    private function formatClass($value)
-    {
-        $r = preg_split("[\(|\)]", $value);
-        if (count($r) > 1) {
-            $param = $r[0];
-            parse_str($r[1], $value);
-            foreach ($value as $key => $val) {
-                $val = explode(',', $val);
-                if (count($val) > 1) {
-                    $value[$key] = $val;
-                }
-            }
-        } else {
-            $param = 'Unknown';
-        }
-        return array($param, $value);
-    }
-
-
-    private function formatParamOrReturn($string)
-    {
-        $pos = strpos($string, ' ');
-        $type = substr($string, 0, $pos);
-        return '(' . $type . ')' . substr($string, $pos + 1);
-    }
+	private $params = array();
+
+
+	function parse($doc = '')
+	{
+		if ($doc == '') {
+			return $this->params;
+		}
+		//Get the comment
+		if (preg_match('#^/\*\*(.*)\*/#s', $doc, $comment) === false) {
+			return $this->params;
+		}
+		$comment = trim($comment[1]);
+		//Get all the lines and strip the * from the first character
+		if (preg_match_all('#^\s*\*(.*)#m', $comment, $lines) === false) {
+			return $this->params;
+		}
+		$this->parseLines($lines[1]);
+		return $this->params;
+	}
+
+
+	private function parseLines($lines)
+	{
+		foreach ($lines as $line) {
+			$parsedLine = $this->parseLine($line); //Parse the line
+
+			if ($parsedLine === false && !isset($this->params['description'])) {
+				if (isset($desc)) {
+					//Store the first line in the short description
+					$this->params['description'] = implode(PHP_EOL, $desc);
+				}
+				$desc = array();
+			} else if ($parsedLine !== false) {
+				$desc[] = $parsedLine; //Store the line in the long description
+			}
+		}
+		$desc = implode(' ', $desc);
+		if (!empty($desc)) {
+			$this->params['long_description'] = $desc;
+		}
+	}
+
+
+	private function parseLine($line)
+	{
+		//trim the whitespace from the line
+		$line = trim($line);
+
+		if (empty($line)) {
+			return false; //Empty line
+		}
+
+		if (strpos($line, '@') === 0) {
+			if (strpos($line, ' ') > 0) {
+				//Get the parameter name
+				$param = substr($line, 1, strpos($line, ' ') - 1);
+				$value = substr($line, strlen($param) + 2); //Get the value
+			} else {
+				$param = substr($line, 1);
+				$value = '';
+			}
+			//Parse the line and return false if the parameter is valid
+			if ($this->setParam($param, $value)) {
+				return false;
+			}
+		}
+		return $line;
+	}
+
+
+	private function setParam($param, $value)
+	{
+		if ($param == 'param' || $param == 'return') {
+			$value = $this->formatParamOrReturn($value);
+		}
+		if ($param == 'class') {
+			list($param, $value) = $this->formatClass($value);
+		}
+
+		if (empty($this->params[$param])) {
+			$this->params[$param] = $value;
+		} else if ($param == 'param') {
+			$arr = array($this->params[$param], $value);
+			$this->params[$param] = $arr;
+		} else {
+			$this->params[$param] = $value + $this->params[$param];
+		}
+		return true;
+	}
+
+
+	private function formatClass($value)
+	{
+		$r = preg_split("[\(|\)]", $value);
+		if (count($r) > 1) {
+			$param = $r[0];
+			parse_str($r[1], $value);
+			foreach ($value as $key => $val) {
+				$val = explode(',', $val);
+				if (count($val) > 1) {
+					$value[$key] = $val;
+				}
+			}
+		} else {
+			$param = 'Unknown';
+		}
+		return array($param, $value);
+	}
+
+
+	private function formatParamOrReturn($string)
+	{
+		$pos = strpos($string, ' ');
+		$type = substr($string, 0, $pos);
+		return '(' . $type . ')' . substr($string, $pos + 1);
+	}
 
 }
 
@@ -1456,30 +1456,30 @@ 
 
 function parse_doc($php_doc_comment)
 {
-    $p = new DocParser();
-    return $p->parse($php_doc_comment);
+	$p = new DocParser();
+	return $p->parse($php_doc_comment);
 
-    $p = new Parser($php_doc_comment);
-    return $p;
+	$p = new Parser($php_doc_comment);
+	return $p;
 
-    $php_doc_comment = preg_replace(
-        "/(^[\\s]*\\/\\*\\*)
+	$php_doc_comment = preg_replace(
+		"/(^[\\s]*\\/\\*\\*)
         |(^[\\s]\\*\\/)
         |(^[\\s]*\\*?\\s)
         |(^[\\s]*)
         |(^[\\t]*)/ixm",
-        "", $php_doc_comment);
-    $php_doc_comment = str_replace("\r", "", $php_doc_comment);
-    $php_doc_comment = preg_replace("/([\\t])+/", "\t", $php_doc_comment);
-    return explode("\n", $php_doc_comment);
-
-    $php_doc_comment = trim(preg_replace('/\r?\n *\* */', ' ', 
-            $php_doc_comment));
-    return $php_doc_comment;
-
-    preg_match_all('/@([a-z]+)\s+(.*?)\s*(?=$|@[a-z]+\s)/s', $php_doc_comment,
-        $matches);
-    return array_combine($matches[1], $matches[2]);
+		"", $php_doc_comment);
+	$php_doc_comment = str_replace("\r", "", $php_doc_comment);
+	$php_doc_comment = preg_replace("/([\\t])+/", "\t", $php_doc_comment);
+	return explode("\n", $php_doc_comment);
+
+	$php_doc_comment = trim(preg_replace('/\r?\n *\* */', ' ', 
+			$php_doc_comment));
+	return $php_doc_comment;
+
+	preg_match_all('/@([a-z]+)\s+(.*?)\s*(?=$|@[a-z]+\s)/s', $php_doc_comment,
+		$matches);
+	return array_combine($matches[1], $matches[2]);
 }
 
 
@@ -1498,21 +1498,21 @@ 
  */
 function object_to_array($object, $utf_encode = false)
 {
-    if (is_array($object)
-        || (is_object($object)
-        && !($object instanceof JsonSerializable))
-    ) {
-        $array = array();
-        foreach ($object as $key => $value) {
-            $value = object_to_array($value, $utf_encode);
-            if ($utf_encode && is_string($value)) {
-                $value = utf8_encode($value);
-            }
-            $array[$key] = $value;
-        }
-        return $array;
-    }
-    return $object;
+	if (is_array($object)
+		|| (is_object($object)
+		&& !($object instanceof JsonSerializable))
+	) {
+		$array = array();
+		foreach ($object as $key => $value) {
+			$value = object_to_array($value, $utf_encode);
+			if ($utf_encode && is_string($value)) {
+				$value = utf8_encode($value);
+			}
+			$array[$key] = $value;
+		}
+		return $array;
+	}
+	return $object;
 }
 
 
@@ -1522,21 +1522,21 @@ 
  */
 function autoload_formats($class_name)
 {
-    $class_name = strtolower($class_name);
+	$class_name = strtolower($class_name);
 	
-    $file = RESTLER_PATH . "../../../api/mobile_services/$class_name.php";
-    if (file_exists($file)) {
-        require_once ($file);
-    } else {
+	$file = RESTLER_PATH . "../../../api/mobile_services/$class_name.php";
+	if (file_exists($file)) {
+		require_once ($file);
+	} else {
 		$file = RESTLER_PATH . "/../../api/mobile_services/$class_name.php";
-        if (file_exists($file)) {
-            require_once ($file);
-        } elseif (file_exists(RESTLER_PATH . "/../api/mobile_services/$class_name.php")) {
-            require_once ("/../api/mobile_services/$class_name.php");
-        } elseif (file_exists("$class_name.php")) {
-            require_once ("$class_name.php");
-        }
-    }
+		if (file_exists($file)) {
+			require_once ($file);
+		} elseif (file_exists(RESTLER_PATH . "/../api/mobile_services/$class_name.php")) {
+			require_once ("/../api/mobile_services/$class_name.php");
+		} elseif (file_exists("$class_name.php")) {
+			require_once ("$class_name.php");
+		}
+	}
 }
 
 // ==================================================================
@@ -1553,10 +1553,10 @@ 
 if (!function_exists('isRestlerCompatibilityModeEnabled')) {
 
 
-    function isRestlerCompatibilityModeEnabled()
-    {
-        return false;
-    }
+	function isRestlerCompatibilityModeEnabled()
+	{
+		return false;
+	}
 
 }
 define('RESTLER_PATH', dirname(__FILE__));
\ No newline at end of file

Spacing +7 added lines, -11 removed lines

@@ -472,9 +472,9 @@ 
         header('Content-Type: ' . $this->response_format->getMIME());
         //.'; charset=utf-8');
         header("X-Powered-By: Luracast Restler v" . Restler::VERSION);
-		if($this->production_mode){
+		if ($this->production_mode) {
 			die($data);
-		}else{
+		} else {
 			echo $data;
 		}
     }
@@ -649,8 +649,7 @@ 
                 $parts = explode(';q=', trim($accept));
                 $type = array_shift($parts);
                 $quality = count($parts) ? 
-                    floatval(array_shift($parts)) : 
-                    (1000 - $pos) / 1000;
+                    floatval(array_shift($parts)) : (1000 - $pos) / 1000;
                 $acceptList[$type] = $quality;
             }
             arsort($acceptList);
@@ -839,8 +838,7 @@ 
                 $position++;
             }
             $method_flag = $method->isProtected() ? 
-                (isRestlerCompatibilityModeEnabled() ? 2 : 3) : 
-                (isset($metadata['protected']) ? 1 : 0);
+                (isRestlerCompatibilityModeEnabled() ? 2 : 3) : (isset($metadata['protected']) ? 1 : 0);
 
             //take note of the order
             $call = array(
@@ -873,8 +871,7 @@ 
                     $http_method = 'GET';
                 }
                 $url = $base_path
-                    . ($method_url == 'index' || $method_url == 'default' ? '' :
-                        $method_url);
+                    . ($method_url == 'index' || $method_url == 'default' ? '' : $method_url);
                 $url = rtrim($url, '/');
                 $this->routes[$http_method][$url] = $call;
                 foreach ($params as $param) {
@@ -1198,8 +1195,7 @@ 
     public function encode($data, $human_readable = false)
     {
         return $human_readable ? 
-            $this->json_format(json_encode(object_to_array($data))) : 
-            json_encode(object_to_array($data));
+            $this->json_format(json_encode(object_to_array($data))) : json_encode(object_to_array($data));
     }
 
 
@@ -1225,7 +1221,7 @@ 
                     $message = 'malformed JSON';
                     break;
                 case JSON_ERROR_UTF8:
-                    $message = 'malformed UTF-8 characters, '.
+                    $message = 'malformed UTF-8 characters, ' .
                         'possibly incorrectly encoded';
                     break;
                 default:

Braces +1 added lines, -1 removed lines

@@ -474,7 +474,7 @@
         header("X-Powered-By: Luracast Restler v" . Restler::VERSION);
 		if($this->production_mode){
 			die($data);
-		}else{
+		} else{
 			echo $data;
 		}
     }

libraries/SabreDAV/DAVACL/FS/HomeCollection.php

Doc Comments +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
      * supplied by the authentication backend.
      *
      * @param array $principalInfo
-     * @return void
+     * @return Collection
      */
     function getChildForPrincipal(array $principalInfo) {
 

Indentation +163 added lines, -163 removed lines

@@ -21,168 +21,168 @@
  */
 class HomeCollection extends AbstractPrincipalCollection implements IACL {
 
-    /**
-     * Name of this collection.
-     *
-     * @var string
-     */
-    public $collectionName = 'home';
-
-    /**
-     * Path to where the users' files are actually stored.
-     *
-     * @var string
-     */
-    protected $storagePath;
-
-    /**
-     * Creates the home collection.
-     *
-     * @param BackendInterface $principalBackend
-     * @param string $storagePath Where the actual files are stored.
-     * @param string $principalPrefix list of principals to iterate.
-     */
-    function __construct(BackendInterface $principalBackend, $storagePath, $principalPrefix = 'principals') {
-
-        parent::__construct($principalBackend, $principalPrefix);
-        $this->storagePath = $storagePath;
-
-    }
-
-    /**
-     * Returns the name of the node.
-     *
-     * This is used to generate the url.
-     *
-     * @return string
-     */
-    function getName() {
-
-        return $this->collectionName;
-
-    }
-
-    /**
-     * Returns a principals' collection of files.
-     *
-     * The passed array contains principal information, and is guaranteed to
-     * at least contain a uri item. Other properties may or may not be
-     * supplied by the authentication backend.
-     *
-     * @param array $principalInfo
-     * @return void
-     */
-    function getChildForPrincipal(array $principalInfo) {
-
-        $owner = $principalInfo['uri'];
-        $acl = [
-            [
-                'privilege' => '{DAV:}read',
-                'principal' => $owner,
-                'protected' => true,
-            ],
-            [
-                'privilege' => '{DAV:}write',
-                'principal' => $owner,
-                'protected' => true,
-            ],
-        ];
-
-        list(, $principalBaseName) = Uri\split($owner);
-
-        $path = $this->storagePath . '/' . $principalBaseName;
-
-        if (!is_dir($path)) {
-            mkdir($path, 0777, true);
-        }
-        return new Collection(
-            $path,
-            $acl,
-            $owner
-        );
-
-    }
-
-    /**
-     * Returns the owner principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    function getOwner() {
-
-        return null;
-
-    }
-
-    /**
-     * Returns a group principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    function getGroup() {
-
-        return null;
-
-    }
-
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to
-     *      be updated.
-     *
-     * @return array
-     */
-    function getACL() {
-
-        return [
-            [
-                'principal' => '{DAV:}authenticated',
-                'privilege' => '{DAV:}read',
-                'protected' => true,
-            ]
-        ];
-
-    }
-
-    /**
-     * Updates the ACL
-     *
-     * This method will receive a list of new ACE's as an array argument.
-     *
-     * @param array $acl
-     * @return void
-     */
-    function setACL(array $acl) {
-
-        throw new Forbidden('Setting ACL is not allowed here');
-
-    }
-
-    /**
-     * Returns the list of supported privileges for this node.
-     *
-     * The returned data structure is a list of nested privileges.
-     * See Sabre\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
-     * standard structure.
-     *
-     * If null is returned from this method, the default privilege set is used,
-     * which is fine for most common usecases.
-     *
-     * @return array|null
-     */
-    function getSupportedPrivilegeSet() {
-
-        return null;
-
-    }
+	/**
+	 * Name of this collection.
+	 *
+	 * @var string
+	 */
+	public $collectionName = 'home';
+
+	/**
+	 * Path to where the users' files are actually stored.
+	 *
+	 * @var string
+	 */
+	protected $storagePath;
+
+	/**
+	 * Creates the home collection.
+	 *
+	 * @param BackendInterface $principalBackend
+	 * @param string $storagePath Where the actual files are stored.
+	 * @param string $principalPrefix list of principals to iterate.
+	 */
+	function __construct(BackendInterface $principalBackend, $storagePath, $principalPrefix = 'principals') {
+
+		parent::__construct($principalBackend, $principalPrefix);
+		$this->storagePath = $storagePath;
+
+	}
+
+	/**
+	 * Returns the name of the node.
+	 *
+	 * This is used to generate the url.
+	 *
+	 * @return string
+	 */
+	function getName() {
+
+		return $this->collectionName;
+
+	}
+
+	/**
+	 * Returns a principals' collection of files.
+	 *
+	 * The passed array contains principal information, and is guaranteed to
+	 * at least contain a uri item. Other properties may or may not be
+	 * supplied by the authentication backend.
+	 *
+	 * @param array $principalInfo
+	 * @return void
+	 */
+	function getChildForPrincipal(array $principalInfo) {
+
+		$owner = $principalInfo['uri'];
+		$acl = [
+			[
+				'privilege' => '{DAV:}read',
+				'principal' => $owner,
+				'protected' => true,
+			],
+			[
+				'privilege' => '{DAV:}write',
+				'principal' => $owner,
+				'protected' => true,
+			],
+		];
+
+		list(, $principalBaseName) = Uri\split($owner);
+
+		$path = $this->storagePath . '/' . $principalBaseName;
+
+		if (!is_dir($path)) {
+			mkdir($path, 0777, true);
+		}
+		return new Collection(
+			$path,
+			$acl,
+			$owner
+		);
+
+	}
+
+	/**
+	 * Returns the owner principal
+	 *
+	 * This must be a url to a principal, or null if there's no owner
+	 *
+	 * @return string|null
+	 */
+	function getOwner() {
+
+		return null;
+
+	}
+
+	/**
+	 * Returns a group principal
+	 *
+	 * This must be a url to a principal, or null if there's no owner
+	 *
+	 * @return string|null
+	 */
+	function getGroup() {
+
+		return null;
+
+	}
+
+	/**
+	 * Returns a list of ACE's for this node.
+	 *
+	 * Each ACE has the following properties:
+	 *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
+	 *     currently the only supported privileges
+	 *   * 'principal', a url to the principal who owns the node
+	 *   * 'protected' (optional), indicating that this ACE is not allowed to
+	 *      be updated.
+	 *
+	 * @return array
+	 */
+	function getACL() {
+
+		return [
+			[
+				'principal' => '{DAV:}authenticated',
+				'privilege' => '{DAV:}read',
+				'protected' => true,
+			]
+		];
+
+	}
+
+	/**
+	 * Updates the ACL
+	 *
+	 * This method will receive a list of new ACE's as an array argument.
+	 *
+	 * @param array $acl
+	 * @return void
+	 */
+	function setACL(array $acl) {
+
+		throw new Forbidden('Setting ACL is not allowed here');
+
+	}
+
+	/**
+	 * Returns the list of supported privileges for this node.
+	 *
+	 * The returned data structure is a list of nested privileges.
+	 * See Sabre\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
+	 * standard structure.
+	 *
+	 * If null is returned from this method, the default privilege set is used,
+	 * which is fine for most common usecases.
+	 *
+	 * @return array|null
+	 */
+	function getSupportedPrivilegeSet() {
+
+		return null;
+
+	}
 
 }

Unused Use Statements +1 added lines, -1 removed lines

@@ -2,10 +2,10 @@
 
 namespace Sabre\DAVACL\FS;
 
-use Sabre\DAV\Exception\Forbidden;
 use Sabre\DAVACL\AbstractPrincipalCollection;
 use Sabre\DAVACL\IACL;
 use Sabre\DAVACL\PrincipalBackend\BackendInterface;
+use Sabre\DAV\Exception\Forbidden;
 use Sabre\Uri;
 
 /**