chamilo / chamilo-lms

main/inc/lib/nusoap/class.wsdl.php

Spacing +205 added lines, -207 removed lines

@@ -45,13 +45,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

@@ -67,7 +67,7 @@ 
 	 * @param boolean $use_curl try to use cURL

      * @access public

      */

-    function __construct($wsdl = '',$proxyhost=false,$proxyport=false,$proxyusername=false,$proxypassword=false,$timeout=0,$response_timeout=30,$curl_options=null,$use_curl=false){

+    function __construct($wsdl = '', $proxyhost = false, $proxyport = false, $proxyusername = false, $proxypassword = false, $timeout = 0, $response_timeout = 30, $curl_options = null, $use_curl = false) {

 		parent::__construct();

 		$this->debug("ctor wsdl=$wsdl timeout=$timeout response_timeout=$response_timeout");

         $this->proxyhost = $proxyhost;

@@ -103,19 +103,19 @@ 
     		// 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']) {

 		                		$this->schemas[$ns]->imports[$ns2][$ii]['loaded'] = true;

 		                		$url = $list2[$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'];

+										$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;

@@ -129,19 +129,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'];

+								$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;

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

-                    $this->debug('post-parse data gathering for ' . $operation);

+                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'] : '';

                 }

             }

@@ -203,13 +201,13 @@ 
         $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);

+            $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){

-				$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);

@@ -220,8 +218,8 @@ 
 			//$this->debug("WSDL response\n" . $tr->incoming_payload);

 			$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);

@@ -232,11 +230,11 @@ 
         } 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'];

+        		$path = isset($wsdl_props['host']) ? ($wsdl_props['host'].':'.$wsdl_props['path']) : $wsdl_props['path'];

         	} else {

         		$path = $wsdl;

         	}

-            $this->debug('getting WSDL file ' . $path);

+            $this->debug('getting WSDL file '.$path);

             if ($fp = @fopen($path, 'r')) {

                 $wsdl_string = '';

                 while ($data = fread($fp, 32768)) {

@@ -272,7 +270,7 @@ 
                 xml_error_string(xml_get_error_code($this->parser))

                 );

             $this->debug($errstr);

-			$this->debug("XML payload:\n" . $wsdl_string);

+			$this->debug("XML payload:\n".$wsdl_string);

             $this->setError($errstr);

             return false;

         }

@@ -280,7 +278,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;

@@ -318,21 +316,21 @@ 
             // 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 {

-                            $this->namespaces['ns' . (count($this->namespaces) + 1)] = $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') {

                             $this->XMLSchemaVersion = $v;

-                            $this->namespaces['xsi'] = $v . '-instance';

+                            $this->namespaces['xsi'] = $v.'-instance';

                         }

                     }

                 }

                 // 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;

@@ -358,12 +356,12 @@ 
                 case 'message':

                     if ($name == 'part') {

 			            if (isset($attrs['type'])) {

-		                    $this->debug("msg " . $this->currentMessage . ": found part (with type) $attrs[name]: " . implode(',', $attrs));

+		                    $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'] . '^';

+		                    $this->debug("msg ".$this->currentMessage.": found part (with element) $attrs[name]: ".implode(',', $attrs));

+			                $this->messages[$this->currentMessage][$attrs['name']] = $attrs['element'].'^';

 			            }

         			}

         			break;

@@ -432,15 +430,15 @@ 
 					switch ($name) {

 					    case 'port':

 					        $this->currentPort = $attrs['name'];

-					        $this->debug('current port: ' . $this->currentPort);

+					        $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'];

+					        $this->bindings[$this->ports[$this->currentPort]['binding']]['bindingType'] = $namespace;

+					        $this->bindings[$this->ports[$this->currentPort]['binding']]['endpoint'] = $attrs['location'];

 					        break;

 					}

 					break;

@@ -450,13 +448,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

@@ -483,13 +481,13 @@ 
 					}

 					$this->status = 'binding';

 					$this->bindings[$this->currentBinding]['portType'] = $this->getLocalPart($attrs['type']);

-					$this->debug("current binding: $this->currentBinding of portType: " . $attrs['type']);

+					$this->debug("current binding: $this->currentBinding of portType: ".$attrs['type']);

 				}

 				break;

 			case 'service':

 				$this->serviceName = $attrs['name'];

 				$this->status = 'service';

-				$this->debug('current service: ' . $this->serviceName);

+				$this->debug('current service: '.$this->serviceName);

 				break;

 			case 'definitions':

 				foreach ($attrs as $name => $value) {

@@ -507,7 +505,7 @@ 
 	* @param string $name element name

 	* @access private

 	*/

-	function end_element($parser, $name){

+	function end_element($parser, $name) {

 		// unset schema status

 		if (/*preg_match('/types$/', $name) ||*/ preg_match('/schema$/', $name)) {

 			$this->status = "";

@@ -592,8 +590,8 @@ 
 		}

 		$this->debug("getOperations for port '$portName' bindingType $bindingType");

 		// loop thru ports

-		foreach($this->ports as $port => $portData) {

-			$this->debug("getOperations checking port $port bindingType " . $portData['bindingType']);

+		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) {

@@ -601,8 +599,8 @@ 
 					//$this->debug("port data: " . $this->varDump($portData));

 					//$this->debug("bindings: " . $this->varDump($this->bindings[ $portData['binding'] ]));

 					// 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']);

 					}

 				}

 			}

@@ -629,15 +627,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;

 					}

 				}

@@ -660,11 +658,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;

 					}

@@ -693,7 +691,7 @@ 
     */

 	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");

 		}

@@ -751,7 +749,7 @@ 
     *

     * @access private

     */

-    function webDescription(){

+    function webDescription() {

     	global $HTTP_SERVER_VARS;

 

 		if (isset($_SERVER)) {

@@ -845,19 +843,19 @@ 
 				<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

+				    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 ($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>";

 								    	}

 					        		//}

@@ -889,31 +887,31 @@ 
 	{

 		$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

 		if (isset($this->namespaces['wsdl'])) {

-			$xml .= " xmlns=\"" . $this->namespaces['wsdl'] . "\"";

+			$xml .= " xmlns=\"".$this->namespaces['wsdl']."\"";

 		}

 		if (isset($this->namespaces['tns'])) {

-			$xml .= " targetNamespace=\"" . $this->namespaces['tns'] . "\"";

+			$xml .= " targetNamespace=\"".$this->namespaces['tns']."\"";

 		}

 		$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 . '" />';

+						$xml .= '<import location="'.$ii['location'].'" namespace="'.$ns.'" />';

 					} else {

-						$xml .= '<import namespace="' . $ns . '" />';

+						$xml .= '<import namespace="'.$ns.'" />';

 					}

 				}

 			}

 		}

 		// 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) {

@@ -924,10 +922,10 @@ 
 		}

 		// messages

 		if (count($this->messages) >= 1) {

-			foreach($this->messages as $msgName => $msgParts) {

-				$xml .= "\n<message name=\"" . $msgName . '">';

-				if(is_array($msgParts)){

-					foreach($msgParts as $partName => $partType) {

+			foreach ($this->messages as $msgName => $msgParts) {

+				$xml .= "\n<message name=\"".$msgName.'">';

+				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));

@@ -935,7 +933,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);

 						        }

@@ -955,7 +953,7 @@ 
 						} else {

 							$elementortype = 'type';

 						}

-						$xml .= "\n" . '  <part name="' . $partName . '" ' . $elementortype . '="' . $typePrefix . ':' . $localPart . '" />';

+						$xml .= "\n".'  <part name="'.$partName.'" '.$elementortype.'="'.$typePrefix.':'.$localPart.'" />';

 					}

 				}

 				$xml .= '</message>';

@@ -965,54 +963,54 @@ 
 		if (count($this->bindings) >= 1) {

 			$binding_xml = '';

 			$portType_xml = '';

-			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) {

-					$binding_xml .= "\n" . '  <operation name="' . $opName . '">';

-					$binding_xml .= "\n" . '    <soap:operation soapAction="' . $opParts['soapAction'] . '" style="'. $opParts['style'] . '"/>';

+			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) {

+					$binding_xml .= "\n".'  <operation name="'.$opName.'">';

+					$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'] . '"';

+						$enc_style = ' encodingStyle="'.$opParts['input']['encodingStyle'].'"';

 					} else {

 						$enc_style = '';

 					}

-					$binding_xml .= "\n" . '    <input><soap:body use="' . $opParts['input']['use'] . '" namespace="' . $opParts['input']['namespace'] . '"' . $enc_style . '/></input>';

+					$binding_xml .= "\n".'    <input><soap:body use="'.$opParts['input']['use'].'" namespace="'.$opParts['input']['namespace'].'"'.$enc_style.'/></input>';

 					if (isset($opParts['output']['encodingStyle']) && $opParts['output']['encodingStyle'] != '') {

-						$enc_style = ' encodingStyle="' . $opParts['output']['encodingStyle'] . '"';

+						$enc_style = ' encodingStyle="'.$opParts['output']['encodingStyle'].'"';

 					} else {

 						$enc_style = '';

 					}

-					$binding_xml .= "\n" . '    <output><soap:body use="' . $opParts['output']['use'] . '" namespace="' . $opParts['output']['namespace'] . '"' . $enc_style . '/></output>';

-					$binding_xml .= "\n" . '  </operation>';

-					$portType_xml .= "\n" . '  <operation name="' . $opParts['name'] . '"';

+					$binding_xml .= "\n".'    <output><soap:body use="'.$opParts['output']['use'].'" namespace="'.$opParts['output']['namespace'].'"'.$enc_style.'/></output>';

+					$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'] != '') {

-						$portType_xml .= "\n" . '    <documentation>' . htmlspecialchars($opParts['documentation']) . '</documentation>';

+					if (isset($opParts['documentation']) && $opParts['documentation'] != '') {

+						$portType_xml .= "\n".'    <documentation>'.htmlspecialchars($opParts['documentation']).'</documentation>';

 					}

-					$portType_xml .= "\n" . '    <input message="tns:' . $opParts['input']['message'] . '"/>';

-					$portType_xml .= "\n" . '    <output message="tns:' . $opParts['output']['message'] . '"/>';

-					$portType_xml .= "\n" . '  </operation>';

+					$portType_xml .= "\n".'    <input message="tns:'.$opParts['input']['message'].'"/>';

+					$portType_xml .= "\n".'    <output message="tns:'.$opParts['output']['message'].'"/>';

+					$portType_xml .= "\n".'  </operation>';

 				}

-				$portType_xml .= "\n" . '</portType>';

-				$binding_xml .= "\n" . '</binding>';

+				$portType_xml .= "\n".'</portType>';

+				$binding_xml .= "\n".'</binding>';

 			}

-			$xml .= $portType_xml . $binding_xml;

+			$xml .= $portType_xml.$binding_xml;

 		}

 		// services

-		$xml .= "\n<service name=\"" . $this->serviceName . '">';

+		$xml .= "\n<service name=\"".$this->serviceName.'">';

 		if (count($this->ports) >= 1) {

-			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>';

+			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>';

 			}

 		}

-		$xml .= "\n" . '</service>';

-		return $xml . "\n</definitions>";

+		$xml .= "\n".'</service>';

+		return $xml."\n</definitions>";

 	}

 

 	/**

@@ -1109,7 +1107,7 @@ 
 	 */

 	function serializeRPCParameters($operation, $direction, $parameters, $bindingType = 'soap') {

 		$this->debug("in serializeRPCParameters: operation=$operation, direction=$direction, XMLSchemaVersion=$this->XMLSchemaVersion, bindingType=$bindingType");

-		$this->appendDebug('parameters=' . $this->varDump($parameters));

+		$this->appendDebug('parameters='.$this->varDump($parameters));

 

 		if ($direction != 'input' && $direction != 'output') {

 			$this->debug('The value of the \$direction argument needs to be either "input" or "output"');

@@ -1117,8 +1115,8 @@ 
 			return false;

 		}

 		if (!$opData = $this->getOperationData($operation, $bindingType)) {

-			$this->debug('Unable to retrieve WSDL data for operation: ' . $operation . ' bindingType: ' . $bindingType);

-			$this->setError('Unable to retrieve WSDL data for operation: ' . $operation . ' bindingType: ' . $bindingType);

+			$this->debug('Unable to retrieve WSDL data for operation: '.$operation.' bindingType: '.$bindingType);

+			$this->setError('Unable to retrieve WSDL data for operation: '.$operation.' bindingType: '.$bindingType);

 			return false;

 		}

 		$this->debug('in serializeRPCParameters: opData:');

@@ -1126,7 +1124,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;

 		}

@@ -1211,7 +1209,7 @@ 
 	function serializeParameters($operation, $direction, $parameters)

 	{

 		$this->debug("in serializeParameters: operation=$operation, direction=$direction, XMLSchemaVersion=$this->XMLSchemaVersion");

-		$this->appendDebug('parameters=' . $this->varDump($parameters));

+		$this->appendDebug('parameters='.$this->varDump($parameters));

 

 		if ($direction != 'input' && $direction != 'output') {

 			$this->debug('The value of the \$direction argument needs to be either "input" or "output"');

@@ -1219,8 +1217,8 @@ 
 			return false;

 		}

 		if (!$opData = $this->getOperationData($operation)) {

-			$this->debug('Unable to retrieve WSDL data for operation: ' . $operation);

-			$this->setError('Unable to retrieve WSDL data for operation: ' . $operation);

+			$this->debug('Unable to retrieve WSDL data for operation: '.$operation);

+			$this->setError('Unable to retrieve WSDL data for operation: '.$operation);

 			return false;

 		}

 		$this->debug('opData:');

@@ -1228,7 +1226,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;

 		}

@@ -1239,14 +1237,14 @@ 
 

 			$use = $opData[$direction]['use'];

 			$this->debug("use=$use");

-			$this->debug('got ' . count($opData[$direction]['parts']) . ' part(s)');

+			$this->debug('got '.count($opData[$direction]['parts']).' part(s)');

 			if (is_array($parameters)) {

 				$parametersArrayType = $this->isArraySimpleOrStruct($parameters);

-				$this->debug('have ' . $parametersArrayType . ' parameters');

-				foreach($opData[$direction]['parts'] as $name => $type) {

+				$this->debug('have '.$parametersArrayType.' parameters');

+				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 {

@@ -1287,18 +1285,18 @@ 
 	 * @return string value serialized as an XML string

 	 * @access private

 	 */

-	function serializeType($name, $type, $value, $use='encoded', $encodingStyle=false, $unqualified=false)

+	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) {

-			$encodingStyle = ' SOAP-ENV:encodingStyle="' . $encodingStyle . '"';

+		$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) {

+			$encodingStyle = ' SOAP-ENV:encodingStyle="'.$encodingStyle.'"';

 		}

 

 		// 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;

+    			$type = $value->type_ns.':'.$value->type;

 		    	$forceType = true;

 		    	$this->debug("in serializeType: soapval overrides type to $type");

     		} elseif ($value->type) {

@@ -1317,7 +1315,7 @@ 
 	    			$value['!'] = $value;

 	    		}

 	    		foreach ($attrs as $n => $v) {

-	    			$value['!' . $n] = $v;

+	    			$value['!'.$n] = $v;

 	    		}

 		    	$this->debug("in serializeType: soapval provides attributes");

 		    }

@@ -1335,7 +1333,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=\"\"";

@@ -1348,7 +1346,7 @@ 
 						$xml = "<$name$elementNS/>";

 					} else {

 						// TODO: depends on nillable, which should be checked before calling this method

-						$xml = "<$name$elementNS xsi:nil=\"true\" xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\"/>";

+						$xml = "<$name$elementNS xsi:nil=\"true\" xsi:type=\"".$this->getPrefixFromNamespace($ns).":$uqType\"/>";

 					}

 					$this->debug("in serializeType: returning: $xml");

 					return $xml;

@@ -1358,7 +1356,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';

@@ -1376,12 +1374,12 @@ 
 				if (!$this->getTypeDef($uqType, $ns)) {

 					if ($use == 'literal') {

 						if ($forceType) {

-							$xml = "<$name$elementNS xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\">$value</$name>";

+							$xml = "<$name$elementNS xsi:type=\"".$this->getPrefixFromNamespace($ns).":$uqType\">$value</$name>";

 						} else {

 							$xml = "<$name$elementNS>$value</$name>";

 						}

 					} else {

-						$xml = "<$name$elementNS xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\"$encodingStyle>$value</$name>";

+						$xml = "<$name$elementNS xsi:type=\"".$this->getPrefixFromNamespace($ns).":$uqType\"$encodingStyle>$value</$name>";

 					}

 					$this->debug("in serializeType: returning: $xml");

 					return $xml;

@@ -1391,29 +1389,29 @@ 
 				$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);

+						$tt_prefix = 'ns'.rand(1000, 9999);

 						$this->namespaces[$tt_prefix] = 'http://xml.apache.org/xml-soap';

 						// force this to be added to usedNamespaces

 						$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') {

 						if ($forceType) {

-							$xml = "<$name xsi:type=\"" . $tt_prefix . ":$uqType\">$contents</$name>";

+							$xml = "<$name xsi:type=\"".$tt_prefix.":$uqType\">$contents</$name>";

 						} else {

 							$xml = "<$name>$contents</$name>";

 						}

 					} else {

-						$xml = "<$name xsi:type=\"" . $tt_prefix . ":$uqType\"$encodingStyle>$contents</$name>";

+						$xml = "<$name xsi:type=\"".$tt_prefix.":$uqType\"$encodingStyle>$contents</$name>";

 					}

 					$this->debug("in serializeType: returning: $xml");

 					return $xml;

@@ -1427,13 +1425,13 @@ 
 			$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;

 		} else {

 			$this->debug("in serializeType: found typeDef");

-			$this->appendDebug('typeDef=' . $this->varDump($typeDef));

+			$this->appendDebug('typeDef='.$this->varDump($typeDef));

 			if (substr($uqType, -1) == '^') {

 				$uqType = substr($uqType, 0, -1);

 			}

@@ -1444,7 +1442,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') {

@@ -1467,7 +1465,7 @@ 
 					// TODO: depends on minOccurs and nillable

 					$xml = "<$elementName$elementNS/>";

 				} else {

-					$xml = "<$elementName$elementNS xsi:nil=\"true\" xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\"/>";

+					$xml = "<$elementName$elementNS xsi:nil=\"true\" xsi:type=\"".$this->getPrefixFromNamespace($ns).":$uqType\"/>";

 				}

 				$this->debug("in serializeType: returning: $xml");

 				return $xml;

@@ -1479,12 +1477,12 @@ 
 				$elementAttrs = $this->serializeComplexTypeAttributes($typeDef, $value, $ns, $uqType);

 				if ($use == 'literal') {

 					if ($forceType) {

-						$xml = "<$elementName$elementNS$elementAttrs xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\">";

+						$xml = "<$elementName$elementNS$elementAttrs xsi:type=\"".$this->getPrefixFromNamespace($ns).":$uqType\">";

 					} else {

 						$xml = "<$elementName$elementNS$elementAttrs>";

 					}

 				} else {

-					$xml = "<$elementName$elementNS$elementAttrs xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\"$encodingStyle>";

+					$xml = "<$elementName$elementNS$elementAttrs xsi:type=\"".$this->getPrefixFromNamespace($ns).":$uqType\"$encodingStyle>";

 				}

 

 				if (isset($typeDef['simpleContent']) && $typeDef['simpleContent'] == 'true') {

@@ -1519,13 +1517,13 @@ 
 					// TODO: depends on minOccurs

 					$xml = "<$name$elementNS/>";

 				} else {

-					$xml = "<$name$elementNS xsi:nil=\"true\" 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'])) .

-						':' .

+					$xml = "<$name$elementNS xsi:nil=\"true\" 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'])."[0]\"/>";

 				}

 				$this->debug("in serializeType: returning: $xml");

@@ -1533,8 +1531,8 @@ 
 			}

 			if (isset($typeDef['multidimensional'])) {

 				$nv = array();

-				foreach($value as $v) {

-					$cols = ',' . sizeof($v);

+				foreach ($value as $v) {

+					$cols = ','.sizeof($v);

 					$nv = array_merge($nv, $v);

 				}

 				$value = $nv;

@@ -1544,10 +1542,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);

@@ -1584,12 +1582,12 @@ 
 			}

 			if ($use == 'literal') {

 				if ($forceType) {

-					$xml = "<$name$elementNS xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\">$value</$name>";

+					$xml = "<$name$elementNS xsi:type=\"".$this->getPrefixFromNamespace($ns).":$uqType\">$value</$name>";

 				} else {

 					$xml = "<$name$elementNS>$value</$name>";

 				}

 			} else {

-				$xml = "<$name$elementNS xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\"$encodingStyle>$value</$name>";

+				$xml = "<$name$elementNS xsi:type=\"".$this->getPrefixFromNamespace($ns).":$uqType\"$encodingStyle>$value</$name>";

 			}

 		}

 		$this->debug("in serializeType: returning: $xml");

@@ -1633,22 +1631,22 @@ 
 				$xvalue = array();

 			}

 			foreach ($typeDef['attrs'] as $aName => $attrs) {

-				if (isset($xvalue['!' . $aName])) {

-					$xname = '!' . $aName;

+				if (isset($xvalue['!'.$aName])) {

+					$xname = '!'.$aName;

 					$this->debug("value provided for attribute $aName with key $xname");

 				} elseif (isset($xvalue[$aName])) {

 					$xname = $aName;

 					$this->debug("value provided for attribute $aName with key $xname");

 				} elseif (isset($attrs['default'])) {

-					$xname = '!' . $aName;

+					$xname = '!'.$aName;

 					$xvalue[$xname] = $attrs['default'];

-					$this->debug('use default value of ' . $xvalue[$aName] . ' for attribute ' . $aName);

+					$this->debug('use default value of '.$xvalue[$aName].' for attribute '.$aName);

 				} else {

 					$xname = '';

 					$this->debug("no value provided for attribute $aName");

 				}

 				if ($xname) {

-					$xml .=  " $aName=\"" . $this->expandEntities($xvalue[$xname]) . "\"";

+					$xml .= " $aName=\"".$this->expandEntities($xvalue[$xname])."\"";

 				}

 			}

 		} else {

@@ -1669,7 +1667,7 @@ 
 	 * @return string value serialized as an XML string

 	 * @access private

 	 */

-	function serializeComplexTypeElements($typeDef, $value, $ns, $uqType, $use='encoded', $encodingStyle=false) {

+	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'])) {

@@ -1696,23 +1694,23 @@ 
 				$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) {

 				if (!isset($xvalue[$eName])) {

 					if (isset($attrs['default'])) {

 						$xvalue[$eName] = $attrs['default'];

-						$this->debug('use default value of ' . $xvalue[$eName] . ' for element ' . $eName);

+						$this->debug('use default value of '.$xvalue[$eName].' for element '.$eName);

 					}

 				}

 				// 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']);

+						$this->debug("apparent error: no value provided for element $eName with minOccurs=".$attrs['minOccurs']);

 					}

 					// do nothing

 					$this->debug("no value provided for complexType element $eName and element is not nillable, so serialize nothing");

@@ -1777,15 +1775,15 @@ 
 	* @see nusoap_xmlschema

 	* @access public

 	*/

-	function addComplexType($name,$typeClass='complexType',$phpType='array',$compositor='',$restrictionBase='',$elements=array(),$attrs=array(),$arrayType='') {

+	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;

@@ -1794,11 +1792,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;

@@ -1806,11 +1804,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);

 	}

 

 	/**

@@ -1824,8 +1822,8 @@ 
 	* @see nusoap_xmlschema

 	* @access public

 	*/

-	function addSimpleType($name, $restrictionBase='', $typeClass='simpleType', $phpType='scalar', $enumeration=array()) {

-		$restrictionBase = strpos($restrictionBase,':') ? $this->expandQname($restrictionBase) : $restrictionBase;

+	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);

@@ -1857,7 +1855,7 @@ 
 	* @param string $encodingStyle optional (usually 'http://schemas.xmlsoap.org/soap/encoding/' for encoded)

 	* @access public

 	*/

-	function addOperation($name, $in = false, $out = false, $namespace = false, $soapaction = false, $style = 'rpc', $use = 'encoded', $documentation = '', $encodingStyle = ''){

+	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/';

 		}

@@ -1867,24 +1865,24 @@ 
 			foreach ($in as $n => $t) {

 				$elements[$n] = array('name' => $n, 'type' => $t, 'form' => 'unqualified');

 			}

-			$this->addComplexType($name . 'RequestType', 'complexType', 'struct', 'all', '', $elements);

-			$this->addElement(array('name' => $name, 'type' => $name . 'RequestType'));

-			$in = array('parameters' => 'tns:' . $name . '^');

+			$this->addComplexType($name.'RequestType', 'complexType', 'struct', 'all', '', $elements);

+			$this->addElement(array('name' => $name, 'type' => $name.'RequestType'));

+			$in = array('parameters' => 'tns:'.$name.'^');

 

 			$elements = array();

 			foreach ($out as $n => $t) {

 				$elements[$n] = array('name' => $n, 'type' => $t, 'form' => 'unqualified');

 			}

-			$this->addComplexType($name . 'ResponseType', 'complexType', 'struct', 'all', '', $elements);

-			$this->addElement(array('name' => $name . 'Response', 'type' => $name . 'ResponseType', 'form' => 'qualified'));

-			$out = array('parameters' => 'tns:' . $name . 'Response' . '^');

+			$this->addComplexType($name.'ResponseType', 'complexType', 'struct', 'all', '', $elements);

+			$this->addElement(array('name' => $name.'Response', 'type' => $name.'ResponseType', 'form' => 'qualified'));

+			$out = array('parameters' => 'tns:'.$name.'Response'.'^');

 		}

 

 		// get binding

-		$this->bindings[ $this->serviceName . 'Binding' ]['operations'][$name] =

+		$this->bindings[$this->serviceName.'Binding']['operations'][$name] =

 		array(

 		'name' => $name,

-		'binding' => $this->serviceName . 'Binding',

+		'binding' => $this->serviceName.'Binding',

 		'endpoint' => $this->endpoint,

 		'soapAction' => $soapaction,

 		'style' => $style,

@@ -1892,42 +1890,42 @@ 
 			'use' => $use,

 			'namespace' => $namespace,

 			'encodingStyle' => $encodingStyle,

-			'message' => $name . 'Request',

+			'message' => $name.'Request',

 			'parts' => $in),

 		'output' => array(

 			'use' => $use,

 			'namespace' => $namespace,

 			'encodingStyle' => $encodingStyle,

-			'message' => $name . 'Response',

+			'message' => $name.'Response',

 			'parts' => $out),

 		'namespace' => $namespace,

 		'transport' => 'http://schemas.xmlsoap.org/soap/http',

 		'documentation' => $documentation);

 		// add portTypes

 		// add messages

-		if($in)

+		if ($in)

 		{

-			foreach($in as $pName => $pType)

+			foreach ($in as $pName => $pType)

 			{

-				if(strpos($pType,':')) {

+				if (strpos($pType, ':')) {

 					$pType = $this->getNamespaceFromPrefix($this->getPrefix($pType)).":".$this->getLocalPart($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,':')) {

+				if (strpos($pType, ':')) {

 					$pType = $this->getNamespaceFromPrefix($this->getPrefix($pType)).":".$this->getLocalPart($pType);

 				}

 				$this->messages[$name.'Response'][$pName] = $pType;

 			}

 		} else {

-            $this->messages[$name.'Response']= '0';

+            $this->messages[$name.'Response'] = '0';

         }

 		return true;

 	}

main/inc/lib/nusoap/class.soapclient.php

Spacing +105 added lines, -105 removed lines

@@ -22,37 +22,37 @@ 
 */

 class nusoap_client extends nusoap_base

 {

-	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 $requestHeaders = false;	// SOAP headers in request (text)

-	var $responseHeaders = '';		// SOAP headers from response (incomplete namespace resolution) (text)

-	var $responseHeader = NULL;		// SOAP Header from response (parsed)

-	var $document = '';				// SOAP body response portion (incomplete namespace resolution) (text)

+	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 $requestHeaders = false; // SOAP headers in request (text)

+	var $responseHeaders = ''; // SOAP headers from response (incomplete namespace resolution) (text)

+	var $responseHeader = NULL; // SOAP Header from response (parsed)

+	var $document = ''; // SOAP body response portion (incomplete namespace resolution) (text)

 	var $endpoint;

-	var $forceEndpoint = '';		// overrides WSDL endpoint

+	var $forceEndpoint = ''; // overrides WSDL endpoint

     var $proxyhost = '';

     var $proxyport = '';

 	var $proxyusername = '';

 	var $proxypassword = '';

-	var $portName = '';				// port name to use in WSDL

-    var $xml_encoding = '';			// character set encoding of incoming (response) messages

+	var $portName = ''; // port name to use in WSDL

+    var $xml_encoding = ''; // character set encoding of incoming (response) messages

 	var $http_encoding = false;

-	var $timeout = 0;				// HTTP connection timeout

-	var $response_timeout = 30;		// HTTP response timeout

-	var $endpointType = '';			// soap|wsdl, empty for WSDL initialization error

+	var $timeout = 0; // HTTP connection timeout

+	var $response_timeout = 30; // HTTP response timeout

+	var $endpointType = ''; // soap|wsdl, empty for WSDL initialization error

 	var $persistentConnection = false;

-	var $defaultRpcParams = false;	// This is no longer used

-	var $request = '';				// HTTP request

-	var $response = '';				// HTTP response

-	var $responseData = '';			// SOAP payload of response

-	var $cookies = array();			// Cookies from response or for request

-    var $decode_utf8 = true;		// toggles whether the parser decodes element content w/ utf8_decode()

-	var $operations = array();		// WSDL operations, empty for WSDL initialization error

-	var $curl_options = array();	// User-specified cURL options

-	var $bindingType = '';			// WSDL operation binding type

-	var $use_curl = false;			// whether to always try to use cURL

+	var $defaultRpcParams = false; // This is no longer used

+	var $request = ''; // HTTP request

+	var $response = ''; // HTTP response

+	var $responseData = ''; // SOAP payload of response

+	var $cookies = array(); // Cookies from response or for request

+    var $decode_utf8 = true; // toggles whether the parser decodes element content w/ utf8_decode()

+	var $operations = array(); // WSDL operations, empty for WSDL initialization error

+	var $curl_options = array(); // User-specified cURL options

+	var $bindingType = ''; // WSDL operation binding type

+	var $use_curl = false; // whether to always try to use cURL

 

 	/*

 	 * fault related variables

@@ -92,7 +92,7 @@ 
 	* @param	string $portName optional portName in WSDL document

 	* @access   public

 	*/

-	function __construct($endpoint,$wsdl = false,$proxyhost = false,$proxyport = false,$proxyusername = false, $proxypassword = false, $timeout = 0, $response_timeout = 30, $portName = ''){

+	function __construct($endpoint, $wsdl = false, $proxyhost = false, $proxyport = false, $proxyusername = false, $proxypassword = false, $timeout = 0, $response_timeout = 30, $portName = '') {

 		parent::__construct();

 		$this->endpoint = $endpoint;

 		$this->proxyhost = $proxyhost;

@@ -104,20 +104,20 @@ 
 		$this->portName = $portName;

 

 		$this->debug("ctor wsdl=$wsdl timeout=$timeout response_timeout=$response_timeout");

-		$this->appendDebug('endpoint=' . $this->varDump($endpoint));

+		$this->appendDebug('endpoint='.$this->varDump($endpoint));

 

 		// make values

-		if($wsdl){

+		if ($wsdl) {

 			if (is_object($endpoint) && (get_class($endpoint) == 'wsdl')) {

 				$this->wsdl = $endpoint;

 				$this->endpoint = $this->wsdl->wsdl;

 				$this->wsdlFile = $this->endpoint;

-				$this->debug('existing wsdl instance created from ' . $this->endpoint);

+				$this->debug('existing wsdl instance created from '.$this->endpoint);

 				$this->checkWSDL();

 			} else {

 				$this->wsdlFile = $this->endpoint;

 				$this->wsdl = null;

-				$this->debug('will use lazy evaluation of wsdl from ' . $this->endpoint);

+				$this->debug('will use lazy evaluation of wsdl from '.$this->endpoint);

 			}

 			$this->endpointType = 'wsdl';

 		} else {

@@ -151,7 +151,7 @@ 
 	* @return	mixed	response from SOAP call, normally an associative array mirroring the structure of the XML response, false for certain fatal errors

 	* @access   public

 	*/

-	function call($operation,$params=array(),$namespace='http://tempuri.org',$soapAction='',$headers=false,$rpcParams=null,$style='rpc',$use='encoded'){

+	function call($operation, $params = array(), $namespace = 'http://tempuri.org', $soapAction = '', $headers = false, $rpcParams = null, $style = 'rpc', $use = 'encoded') {

 		$this->operation = $operation;

 		$this->fault = false;

 		$this->setError('');

@@ -163,8 +163,8 @@ 
 		$this->opData = array();

 

 		$this->debug("call: operation=$operation, namespace=$namespace, soapAction=$soapAction, rpcParams=$rpcParams, style=$style, use=$use, endpointType=$this->endpointType");

-		$this->appendDebug('params=' . $this->varDump($params));

-		$this->appendDebug('headers=' . $this->varDump($headers));

+		$this->appendDebug('params='.$this->varDump($params));

+		$this->appendDebug('headers='.$this->varDump($headers));

 		if ($headers) {

 			$this->requestHeaders = $headers;

 		}

@@ -174,25 +174,25 @@ 
 				return false;

 		}

 		// serialize parameters

-		if($this->endpointType == 'wsdl' && $opData = $this->getOperationData($operation)){

+		if ($this->endpointType == 'wsdl' && $opData = $this->getOperationData($operation)) {

 			// use WSDL for operation

 			$this->opData = $opData;

 			$this->debug("found operation");

-			$this->appendDebug('opData=' . $this->varDump($opData));

+			$this->appendDebug('opData='.$this->varDump($opData));

 			if (isset($opData['soapAction'])) {

 				$soapAction = $opData['soapAction'];

 			}

-			if (! $this->forceEndpoint) {

+			if (!$this->forceEndpoint) {

 				$this->endpoint = $opData['endpoint'];

 			} else {

 				$this->endpoint = $this->forceEndpoint;

 			}

-			$namespace = isset($opData['input']['namespace']) ? $opData['input']['namespace'] :	$namespace;

+			$namespace = isset($opData['input']['namespace']) ? $opData['input']['namespace'] : $namespace;

 			$style = $opData['style'];

 			$use = $opData['input']['use'];

 			// add ns to ns array

-			if($namespace != '' && !isset($this->wsdl->namespaces[$namespace])){

-				$nsPrefix = 'ns' . rand(1000, 9999);

+			if ($namespace != '' && !isset($this->wsdl->namespaces[$namespace])) {

+				$nsPrefix = 'ns'.rand(1000, 9999);

 				$this->wsdl->namespaces[$nsPrefix] = $namespace;

 			}

             $nsPrefix = $this->wsdl->getPrefixFromNamespace($namespace);

@@ -202,7 +202,7 @@ 
 				$payload = $params;

 			} elseif (is_array($params)) {

 				$this->debug("serializing param array for WSDL operation $operation");

-				$payload = $this->wsdl->serializeRPCParameters($operation,'input',$params,$this->bindingType);

+				$payload = $this->wsdl->serializeRPCParameters($operation, 'input', $params, $this->bindingType);

 			} else {

 				$this->debug('params must be array or string');

 				$this->setError('params must be array or string');

@@ -221,7 +221,7 @@ 
 				$this->setError('wsdl error: '.$errstr);

 				return false;

 			}

-		} elseif($this->endpointType == 'wsdl') {

+		} elseif ($this->endpointType == 'wsdl') {

 			// operation not in WSDL

 			$this->appendDebug($this->wsdl->getDebug());

 			$this->wsdl->clearDebug();

@@ -231,7 +231,7 @@ 
 		} else {

 			// no WSDL

 			//$this->namespaces['ns1'] = $namespace;

-			$nsPrefix = 'ns' . rand(1000, 9999);

+			$nsPrefix = 'ns'.rand(1000, 9999);

 			// serialize

 			$payload = '';

 			if (is_string($params)) {

@@ -239,8 +239,8 @@ 
 				$payload = $params;

 			} elseif (is_array($params)) {

 				$this->debug("serializing param array for operation $operation");

-				foreach($params as $k => $v){

-					$payload .= $this->serialize_val($v,$k,false,false,false,false,$use);

+				foreach ($params as $k => $v) {

+					$payload .= $this->serialize_val($v, $k, false, false, false, false, $use);

 				}

 			} else {

 				$this->debug('params must be array or string');

@@ -260,45 +260,45 @@ 
 				$this->debug("wrapping RPC request with literal method element");

 				if ($namespace) {

 					// http://www.ws-i.org/Profiles/BasicProfile-1.1-2004-08-24.html R2735 says rpc/literal accessor elements should not be in a namespace

-					$payload = "<$nsPrefix:$operation xmlns:$nsPrefix=\"$namespace\">" .

-								$payload .

+					$payload = "<$nsPrefix:$operation xmlns:$nsPrefix=\"$namespace\">".

+								$payload.

 								"</$nsPrefix:$operation>";

 				} else {

-					$payload = "<$operation>" . $payload . "</$operation>";

+					$payload = "<$operation>".$payload."</$operation>";

 				}

 			} else {

 				$this->debug("wrapping RPC request with encoded method element");

 				if ($namespace) {

-					$payload = "<$nsPrefix:$operation xmlns:$nsPrefix=\"$namespace\">" .

-								$payload .

+					$payload = "<$nsPrefix:$operation xmlns:$nsPrefix=\"$namespace\">".

+								$payload.

 								"</$nsPrefix:$operation>";

 				} else {

-					$payload = "<$operation>" .

-								$payload .

+					$payload = "<$operation>".

+								$payload.

 								"</$operation>";

 				}

 			}

 		}

 		// serialize envelope

-		$soapmsg = $this->serializeEnvelope($payload,$this->requestHeaders,$usedNamespaces,$style,$use,$encodingStyle);

+		$soapmsg = $this->serializeEnvelope($payload, $this->requestHeaders, $usedNamespaces, $style, $use, $encodingStyle);

 		$this->debug("endpoint=$this->endpoint, soapAction=$soapAction, namespace=$namespace, style=$style, use=$use, encodingStyle=$encodingStyle");

-		$this->debug('SOAP message length=' . strlen($soapmsg) . ' contents (max 1000 bytes)=' . substr($soapmsg, 0, 1000));

+		$this->debug('SOAP message length='.strlen($soapmsg).' contents (max 1000 bytes)='.substr($soapmsg, 0, 1000));

 		// send

-		$return = $this->send($this->getHTTPBody($soapmsg),$soapAction,$this->timeout,$this->response_timeout);

-		if($errstr = $this->getError()){

+		$return = $this->send($this->getHTTPBody($soapmsg), $soapAction, $this->timeout, $this->response_timeout);

+		if ($errstr = $this->getError()) {

 			$this->debug('Error: '.$errstr);

 			return false;

 		} else {

 			$this->return = $return;

 			$this->debug('sent message successfully and got a(n) '.gettype($return));

-           	$this->appendDebug('return=' . $this->varDump($return));

+           	$this->appendDebug('return='.$this->varDump($return));

 

 			// fault?

-			if(is_array($return) && isset($return['faultcode'])){

+			if (is_array($return) && isset($return['faultcode'])) {

 				$this->debug('got fault');

 				$this->setError($return['faultcode'].': '.$return['faultstring']);

 				$this->fault = true;

-				foreach($return as $k => $v){

+				foreach ($return as $k => $v) {

 					$this->$k = $v;

 					$this->debug("$k = $v<br>");

 				}

@@ -309,10 +309,10 @@ 
 				return $return;

 			} else {

 				// array of return values

-				if(is_array($return)){

+				if (is_array($return)) {

 					// multiple 'out' parameters, which we return wrapped up

 					// in the array

-					if(sizeof($return) > 1){

+					if (sizeof($return) > 1) {

 						return $return;

 					}

 					// single 'out' parameter (normally the return value)

@@ -369,7 +369,7 @@ 
 	 */

 	function loadWSDL() {

 		$this->debug('instantiating wsdl class with doc: '.$this->wsdlFile);

-		$this->wsdl = new wsdl('',$this->proxyhost,$this->proxyport,$this->proxyusername,$this->proxypassword,$this->timeout,$this->response_timeout,$this->curl_options,$this->use_curl);

+		$this->wsdl = new wsdl('', $this->proxyhost, $this->proxyport, $this->proxyusername, $this->proxypassword, $this->timeout, $this->response_timeout, $this->curl_options, $this->use_curl);

 		$this->wsdl->setCredentials($this->username, $this->password, $this->authtype, $this->certRequest);

 		$this->wsdl->fetchWSDL($this->wsdlFile);

 		$this->checkWSDL();

@@ -382,13 +382,13 @@ 
 	* @return	array array of data pertaining to the operation

 	* @access   public

 	*/

-	function getOperationData($operation){

+	function getOperationData($operation) {

 		if ($this->endpointType == 'wsdl' && is_null($this->wsdl)) {

 			$this->loadWSDL();

 			if ($this->getError())

 				return false;

 		}

-		if(isset($this->operations[$operation])){

+		if (isset($this->operations[$operation])) {

 			return $this->operations[$operation];

 		}

 		$this->debug("No data for operation: $operation");

@@ -408,15 +408,15 @@ 
 	* @return	mixed native PHP types.

 	* @access   private

 	*/

-	function send($msg, $soapaction = '', $timeout=0, $response_timeout=30) {

+	function send($msg, $soapaction = '', $timeout = 0, $response_timeout = 30) {

 		$this->checkCookies();

 		// detect transport

-		switch(true){

+		switch (true) {

 			// http(s)

-			case preg_match('/^http/',$this->endpoint):

+			case preg_match('/^http/', $this->endpoint):

 				$this->debug('transporting via HTTP');

-				if($this->persistentConnection == true && is_object($this->persistentConnection)){

-					$http =& $this->persistentConnection;

+				if ($this->persistentConnection == true && is_object($this->persistentConnection)) {

+					$http = & $this->persistentConnection;

 				} else {

 					$http = new soap_transport_http($this->endpoint, $this->curl_options, $this->use_curl);

 					if ($this->persistentConnection) {

@@ -425,27 +425,27 @@ 
 				}

 				$http->setContentType($this->getHTTPContentType(), $this->getHTTPContentTypeCharset());

 				$http->setSOAPAction($soapaction);

-				if($this->proxyhost && $this->proxyport){

-					$http->setProxy($this->proxyhost,$this->proxyport,$this->proxyusername,$this->proxypassword);

+				if ($this->proxyhost && $this->proxyport) {

+					$http->setProxy($this->proxyhost, $this->proxyport, $this->proxyusername, $this->proxypassword);

 				}

-                if($this->authtype != '') {

+                if ($this->authtype != '') {

 					$http->setCredentials($this->username, $this->password, $this->authtype, array(), $this->certRequest);

 				}

-				if($this->http_encoding != ''){

+				if ($this->http_encoding != '') {

 					$http->setEncoding($this->http_encoding);

 				}

 				$this->debug('sending message, length='.strlen($msg));

-				if(preg_match('/^http:/',$this->endpoint)){

+				if (preg_match('/^http:/', $this->endpoint)) {

 				//if(strpos($this->endpoint,'http:')){

-					$this->responseData = $http->send($msg,$timeout,$response_timeout,$this->cookies);

-				} elseif(preg_match('/^https/',$this->endpoint)){

+					$this->responseData = $http->send($msg, $timeout, $response_timeout, $this->cookies);

+				} elseif (preg_match('/^https/', $this->endpoint)) {

 				//} elseif(strpos($this->endpoint,'https:')){

 					//if(phpversion() == '4.3.0-dev'){

 						//$response = $http->send($msg,$timeout,$response_timeout);

                    		//$this->request = $http->outgoing_payload;

 						//$this->response = $http->incoming_payload;

 					//} else

-					$this->responseData = $http->sendHTTPS($msg,$timeout,$response_timeout,$this->cookies);

+					$this->responseData = $http->sendHTTPS($msg, $timeout, $response_timeout, $this->cookies);

 				} else {

 					$this->setError('no http/s in endpoint url');

 				}

@@ -462,13 +462,13 @@ 
 					}

 				}

 

-				if($err = $http->getError()){

+				if ($err = $http->getError()) {

 					$this->setError('HTTP Error: '.$err);

 					return false;

-				} elseif($this->getError()){

+				} elseif ($this->getError()) {

 					return false;

 				} else {

-					$this->debug('got response, length='. strlen($this->responseData).' type='.$http->incoming_headers['content-type']);

+					$this->debug('got response, length='.strlen($this->responseData).' type='.$http->incoming_headers['content-type']);

 					return $this->parseResponse($http->incoming_headers, $this->responseData);

 				}

 			break;

@@ -488,20 +488,20 @@ 
 	* @access   private

 	*/

     function parseResponse($headers, $data) {

-		$this->debug('Entering parseResponse() for data of length ' . strlen($data) . ' headers:');

+		$this->debug('Entering parseResponse() for data of length '.strlen($data).' headers:');

 		$this->appendDebug($this->varDump($headers));

     	if (!isset($headers['content-type'])) {

 			$this->setError('Response not of type text/xml (no content-type header)');

 			return false;

     	}

 		if (!strstr($headers['content-type'], 'text/xml')) {

-			$this->setError('Response not of type text/xml: ' . $headers['content-type']);

+			$this->setError('Response not of type text/xml: '.$headers['content-type']);

 			return false;

 		}

 		if (strpos($headers['content-type'], '=')) {

 			$enc = str_replace('"', '', substr(strstr($headers["content-type"], '='), 1));

-			$this->debug('Got response encoding: ' . $enc);

-			if(preg_match('/^(ISO-8859-1|US-ASCII|UTF-8)$/i',$enc)){

+			$this->debug('Got response encoding: '.$enc);

+			if (preg_match('/^(ISO-8859-1|US-ASCII|UTF-8)$/i', $enc)) {

 				$this->xml_encoding = strtoupper($enc);

 			} else {

 				$this->xml_encoding = 'US-ASCII';

@@ -510,13 +510,13 @@ 
 			// should be US-ASCII for HTTP 1.0 or ISO-8859-1 for HTTP 1.1

 			$this->xml_encoding = 'ISO-8859-1';

 		}

-		$this->debug('Use encoding: ' . $this->xml_encoding . ' when creating nusoap_parser');

-		$parser = new nusoap_parser($data,$this->xml_encoding,$this->operation,$this->decode_utf8);

+		$this->debug('Use encoding: '.$this->xml_encoding.' when creating nusoap_parser');

+		$parser = new nusoap_parser($data, $this->xml_encoding, $this->operation, $this->decode_utf8);

 		// add parser debug data to our debug

 		$this->appendDebug($parser->getDebug());

 		// if parse errors

-		if($errstr = $parser->getError()){

-			$this->setError( $errstr);

+		if ($errstr = $parser->getError()) {

+			$this->setError($errstr);

 			// destroy the parser object

 			unset($parser);

 			return false;

@@ -566,7 +566,7 @@ 
 	* @param	mixed $headers String of XML with SOAP header content, or array of soapval objects for SOAP headers

 	* @access   public

 	*/

-	function setHeaders($headers){

+	function setHeaders($headers) {

 		$this->debug("setHeaders headers=");

 		$this->appendDebug($this->varDump($headers));

 		$this->requestHeaders = $headers;

@@ -578,7 +578,7 @@ 
 	* @return	string

 	* @access   public

 	*/

-	function getHeaders(){

+	function getHeaders() {

 		return $this->responseHeaders;

 	}

 

@@ -588,7 +588,7 @@ 
 	* @return	mixed

 	* @access   public

 	*/

-	function getHeader(){

+	function getHeader() {

 		return $this->responseHeader;

 	}

 

@@ -632,7 +632,7 @@ 
 	* @param    string $enc HTTP encoding

 	* @access   public

 	*/

-	function setHTTPEncoding($enc='gzip, deflate'){

+	function setHTTPEncoding($enc = 'gzip, deflate') {

 		$this->debug("setHTTPEncoding(\"$enc\")");

 		$this->http_encoding = $enc;

 	}

@@ -653,7 +653,7 @@ 
 	*

 	* @access   public

 	*/

-	function useHTTPPersistentConnection(){

+	function useHTTPPersistentConnection() {

 		$this->debug("useHTTPPersistentConnection");

 		$this->persistentConnection = true;

 	}

@@ -745,7 +745,7 @@ 
 	*/

 	function _getProxyClassCode($r) {

 		$this->debug("in getProxy endpointType=$this->endpointType");

-		$this->appendDebug("wsdl=" . $this->varDump($this->wsdl));

+		$this->appendDebug("wsdl=".$this->varDump($this->wsdl));

 		if ($this->endpointType != 'wsdl') {

 			$evalStr = 'A proxy can only be created for a WSDL client';

 			$this->setError($evalStr);

@@ -755,7 +755,7 @@ 
 		if ($this->endpointType == 'wsdl' && is_null($this->wsdl)) {

 			$this->loadWSDL();

 			if ($this->getError()) {

-				return "echo \"" . $this->getError() . "\";";

+				return "echo \"".$this->getError()."\";";

 			}

 		}

 		$evalStr = '';

@@ -771,9 +771,9 @@ 
 						$paramArrayStr .= "'$name' => \$$name, ";

 						$paramCommentStr .= "$type \$$name, ";

 					}

-					$paramStr = substr($paramStr, 0, strlen($paramStr)-2);

-					$paramArrayStr = substr($paramArrayStr, 0, strlen($paramArrayStr)-2);

-					$paramCommentStr = substr($paramCommentStr, 0, strlen($paramCommentStr)-2);

+					$paramStr = substr($paramStr, 0, strlen($paramStr) - 2);

+					$paramArrayStr = substr($paramArrayStr, 0, strlen($paramArrayStr) - 2);

+					$paramCommentStr = substr($paramCommentStr, 0, strlen($paramCommentStr) - 2);

 				} else {

 					$paramStr = '';

 					$paramArrayStr = '';

@@ -781,7 +781,7 @@ 
 				}

 				$opData['namespace'] = !isset($opData['namespace']) ? 'http://testuri.com' : $opData['namespace'];

 				$evalStr .= "// $paramCommentStr

-	function " . str_replace('.', '__', $operation) . "($paramStr) {

+	function ".str_replace('.', '__', $operation)."($paramStr) {

 		\$params = array($paramArrayStr);

 		return \$this->call('$operation', \$params, '".$opData['namespace']."', '".(isset($opData['soapAction']) ? $opData['soapAction'] : '')."');

 	}

@@ -849,7 +849,7 @@ 
     * @return   always returns true

     * @access   public

     */

-    function decodeUTF8($bool){

+    function decodeUTF8($bool) {

 		$this->decode_utf8 = $bool;

 		return true;

     }

@@ -890,19 +890,19 @@ 
 		if (sizeof($this->cookies) == 0) {

 			return true;

 		}

-		$this->debug('checkCookie: check ' . sizeof($this->cookies) . ' cookies');

+		$this->debug('checkCookie: check '.sizeof($this->cookies).' cookies');

 		$curr_cookies = $this->cookies;

 		$this->cookies = array();

 		foreach ($curr_cookies as $cookie) {

-			if (! is_array($cookie)) {

+			if (!is_array($cookie)) {

 				$this->debug('Remove cookie that is not an array');

 				continue;

 			}

-			if ((isset($cookie['expires'])) && (! empty($cookie['expires']))) {

+			if ((isset($cookie['expires'])) && (!empty($cookie['expires']))) {

 				if (strtotime($cookie['expires']) > time()) {

 					$this->cookies[] = $cookie;

 				} else {

-					$this->debug('Remove expired cookie ' . $cookie['name']);

+					$this->debug('Remove expired cookie '.$cookie['name']);

 				}

 			} else {

 				$this->cookies[] = $cookie;

@@ -966,11 +966,11 @@ 
 				}

 				$this->cookies[$i] = $newCookie;

 				$found = true;

-				$this->debug('Update cookie ' . $newName . '=' . $newCookie['value']);

+				$this->debug('Update cookie '.$newName.'='.$newCookie['value']);

 				break;

 			}

-			if (! $found) {

-				$this->debug('Add cookie ' . $newName . '=' . $newCookie['value']);

+			if (!$found) {

+				$this->debug('Add cookie '.$newName.'='.$newCookie['value']);

 				$this->cookies[] = $newCookie;

 			}

 		}

main/inc/lib/nusoap/class.soap_val.php

Spacing +3 added lines, -3 removed lines

@@ -67,7 +67,7 @@ 
 	* @param	mixed $attributes associative array of attributes to add to element serialization

 	* @access   public

 	*/

-  	function __construct($name='soapval',$type=false,$value=-1,$element_ns=false,$type_ns=false,$attributes=false) {

+  	function __construct($name = 'soapval', $type = false, $value = -1, $element_ns = false, $type_ns = false, $attributes = false) {

 		parent::__construct();

 		$this->name = $name;

 		$this->type = $type;

@@ -84,7 +84,7 @@ 
 	* @return	string XML data

 	* @access   public

 	*/

-	function serialize($use='encoded') {

+	function serialize($use = 'encoded') {

 		return $this->serialize_val($this->value, $this->name, $this->type, $this->element_ns, $this->type_ns, $this->attributes, $use, true);

     }

 

@@ -94,7 +94,7 @@ 
 	* @return	mixed

 	* @access   public

 	*/

-	function decode(){

+	function decode() {

 		return $this->value;

 	}

 }

main/inc/lib/nusoap/class.soap_parser.php

Spacing +76 added lines, -76 removed lines

@@ -18,7 +18,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;

@@ -33,9 +33,9 @@ 
 	var $fault_detail = '';

 	var $depth_array = array();

 	var $debug_flag = true;

-	var $soapresponse = NULL;	// parsed SOAP Body

-	var $soapheader = NULL;		// parsed SOAP Header

-	var $responseHeaders = '';	// incoming SOAP headers (text)

+	var $soapresponse = NULL; // parsed SOAP Body

+	var $soapheader = NULL; // parsed SOAP Header

+	var $responseHeaders = ''; // incoming SOAP headers (text)

 	var $body_position = 0;

 	// for multiref parsing:

 	// array of id => pos

@@ -55,7 +55,7 @@ 
 	* @return void|bool

 	* @access   public

 	*/

-	function __construct($xml,$encoding='UTF-8',$method='',$decode_utf8=true)

+	function __construct($xml, $encoding = 'UTF-8', $method = '', $decode_utf8 = true)

     {

 		parent::__construct();

 		$this->xml = $xml;

@@ -64,7 +64,7 @@ 
 		$this->decode_utf8 = $decode_utf8;

 

 		// Check whether content has been read.

-		if(!empty($this->xml)){

+		if (!empty($this->xml)) {

 			// Check XML encoding

 			$pos_xml = strpos($xml, '<?xml');

 			if ($pos_xml !== FALSE) {

@@ -72,7 +72,7 @@ 
 				if (preg_match("/encoding=[\"']([^\"']*)[\"']/", $xml_decl, $res)) {

 					$xml_encoding = $res[1];

 					if (strtoupper($xml_encoding) != $encoding) {

-						$err = "Charset from HTTP Content-Type '" . $encoding . "' does not match encoding from XML declaration '" . $xml_encoding . "'";

+						$err = "Charset from HTTP Content-Type '".$encoding."' does not match encoding from XML declaration '".$xml_encoding."'";

 						$this->debug($err);

 						if ($encoding != 'ISO-8859-1' || strtoupper($xml_encoding) != 'UTF-8') {

 							$this->setError($err);

@@ -98,8 +98,8 @@ 
 			// Set the object for the parser.

 			xml_set_object($this->parser, $this);

 			// Set the element handlers for the parser.

-			xml_set_element_handler($this->parser, 'start_element','end_element');

-			xml_set_character_data_handler($this->parser,'character_data');

+			xml_set_element_handler($this->parser, 'start_element', 'end_element');

+			xml_set_character_data_handler($this->parser, 'character_data');

 

 			xml_parse($this->parser, $this->xml);

 

@@ -111,7 +111,7 @@ 
 			    xml_get_current_line_number($this->parser),

 			    xml_error_string(xml_get_error_code($this->parser)));

 				$this->debug($err);

-				$this->debug("XML payload:\n" . $xml);

+				$this->debug("XML payload:\n".$xml);

 				$this->setError($err);

 			} else {

 				$this->debug('in nusoap_parser ctor, message:');

@@ -120,18 +120,18 @@ 
 				// get final value

 				$this->soapresponse = $this->message[$this->root_struct]['result'];

 				// get header value

-				if($this->root_header != '' && isset($this->message[$this->root_header]['result'])){

+				if ($this->root_header != '' && isset($this->message[$this->root_header]['result'])) {

 					$this->soapheader = $this->message[$this->root_header]['result'];

 				}

 				// resolve hrefs/ids

-				if(sizeof($this->multirefs) > 0){

-					foreach($this->multirefs as $id => $hrefs){

+				if (sizeof($this->multirefs) > 0) {

+					foreach ($this->multirefs as $id => $hrefs) {

 						$this->debug('resolving multirefs for id: '.$id);

 						$idVal = $this->buildVal($this->ids[$id]);

 						if (is_array($idVal) && isset($idVal['!id'])) {

 							unset($idVal['!id']);

 						}

-						foreach($hrefs as $refPos => $ref){

+						foreach ($hrefs as $refPos => $ref) {

 							$this->debug('resolving href at pos '.$refPos);

 							$this->multirefs[$id][$refPos] = $idVal;

 						}

@@ -159,13 +159,13 @@ 
 		// update class level pos

 		$pos = $this->position++;

 		// and set mine

-		$this->message[$pos] = array('pos' => $pos,'children'=>'','cdata'=>'');

+		$this->message[$pos] = array('pos' => $pos, 'children'=>'', 'cdata'=>'');

 		// depth = how many levels removed from root?

 		// set mine as current global depth and increment global depth value

 		$this->message[$pos]['depth'] = $this->depth++;

 

 		// else add self as child to whoever the current parent is

-		if($pos != 0){

+		if ($pos != 0) {

 			$this->message[$this->parent]['children'] .= '|'.$pos;

 		}

 		// set my parent

@@ -175,11 +175,11 @@ 
 		// set self as current value for this depth

 		$this->depth_array[$this->depth] = $pos;

 		// get element prefix

-		if(strpos($name,':')){

+		if (strpos($name, ':')) {

 			// get ns prefix

-			$prefix = substr($name,0,strpos($name,':'));

+			$prefix = substr($name, 0, strpos($name, ':'));

 			// get unqualified name

-			$name = substr(strstr($name,':'),1);

+			$name = substr(strstr($name, ':'), 1);

 		}

 		// set status

 		if ($name == 'Envelope' && $this->status == '') {

@@ -187,11 +187,11 @@ 
 		} elseif ($name == 'Header' && $this->status == 'envelope') {

 			$this->root_header = $pos;

 			$this->status = 'header';

-		} elseif ($name == 'Body' && $this->status == 'envelope'){

+		} elseif ($name == 'Body' && $this->status == 'envelope') {

 			$this->status = 'body';

 			$this->body_position = $pos;

 		// set method

-		} elseif($this->status == 'body' && $pos == ($this->body_position+1)) {

+		} elseif ($this->status == 'body' && $pos == ($this->body_position + 1)) {

 			$this->status = 'method';

 			$this->root_struct_name = $name;

 			$this->root_struct = $pos;

@@ -207,23 +207,23 @@ 
 

 		// loop through atts, logging ns and type declarations

         $attstr = '';

-		foreach($attrs as $key => $value){

+		foreach ($attrs as $key => $value) {

         	$key_prefix = $this->getPrefix($key);

 			$key_localpart = $this->getLocalPart($key);

 			// if ns declarations, add to class level array of valid namespaces

-            if($key_prefix == 'xmlns'){

-				if(preg_match('/^http:\/\/www.w3.org\/[0-9]{4}\/XMLSchema$/',$value)){

+            if ($key_prefix == 'xmlns') {

+				if (preg_match('/^http:\/\/www.w3.org\/[0-9]{4}\/XMLSchema$/', $value)) {

 					$this->XMLSchemaVersion = $value;

 					$this->namespaces['xsd'] = $this->XMLSchemaVersion;

 					$this->namespaces['xsi'] = $this->XMLSchemaVersion.'-instance';

 				}

                 $this->namespaces[$key_localpart] = $value;

 				// set method namespace

-				if($name == $this->root_struct_name){

+				if ($name == $this->root_struct_name) {

 					$this->methodNamespace = $value;

 				}

 			// if it's a type declaration, set type

-        } elseif($key_localpart == 'type'){

+        } elseif ($key_localpart == 'type') {

         		if (isset($this->message[$pos]['type']) && $this->message[$pos]['type'] == 'array') {

         			// do nothing: already processed arrayType

         		} else {

@@ -231,14 +231,14 @@ 
 	                $value_localpart = $this->getLocalPart($value);

 					$this->message[$pos]['type'] = $value_localpart;

 					$this->message[$pos]['typePrefix'] = $value_prefix;

-	                if(isset($this->namespaces[$value_prefix])){

+	                if (isset($this->namespaces[$value_prefix])) {

 	                	$this->message[$pos]['type_namespace'] = $this->namespaces[$value_prefix];

-	                } else if(isset($attrs['xmlns:'.$value_prefix])) {

+	                } else if (isset($attrs['xmlns:'.$value_prefix])) {

 						$this->message[$pos]['type_namespace'] = $attrs['xmlns:'.$value_prefix];

 	                }

 					// should do something here with the namespace of specified type?

 				}

-			} elseif($key_localpart == 'arrayType'){

+			} elseif ($key_localpart == 'arrayType') {

 				$this->message[$pos]['type'] = 'array';

 				/* do arrayType ereg here

 				[1]    arrayTypeValue    ::=    atype asize

@@ -249,7 +249,7 @@ 
 				[6]    nextDimension    ::=    Digit+ ','

 				*/

 				$expr = '/([A-Za-z0-9_]+):([A-Za-z]+[A-Za-z0-9_]+)\[([0-9]+),?([0-9]*)\]/';

-				if(preg_match($expr,$value,$regs)){

+				if (preg_match($expr, $value, $regs)) {

 					$this->message[$pos]['typePrefix'] = $regs[1];

 					$this->message[$pos]['arrayTypePrefix'] = $regs[1];

 	                if (isset($this->namespaces[$regs[1]])) {

@@ -262,22 +262,22 @@ 
 					$this->message[$pos]['arrayCols'] = $regs[4];

 				}

 			// specifies nil value (or not)

-			} elseif ($key_localpart == 'nil'){

+			} elseif ($key_localpart == 'nil') {

 				$this->message[$pos]['nil'] = ($value == 'true' || $value == '1');

 			// some other attribute

 			} elseif ($key != 'href' && $key != 'xmlns' && $key_localpart != 'encodingStyle' && $key_localpart != 'root') {

-				$this->message[$pos]['xattrs']['!' . $key] = $value;

+				$this->message[$pos]['xattrs']['!'.$key] = $value;

 			}

 

 			if ($key == 'xmlns') {

 				$this->default_namespace = $value;

 			}

 			// log id

-			if($key == 'id'){

+			if ($key == 'id') {

 				$this->ids[$value] = $pos;

 			}

 			// root

-			if($key_localpart == 'root' && $value == 1){

+			if ($key_localpart == 'root' && $value == 1) {

 				$this->status = 'method';

 				$this->root_struct_name = $name;

 				$this->root_struct = $pos;

@@ -287,18 +287,18 @@ 
             $attstr .= " $key=\"$value\"";

 		}

         // get namespace - must be done after namespace atts are processed

-		if(isset($prefix)){

+		if (isset($prefix)) {

 			$this->message[$pos]['namespace'] = $this->namespaces[$prefix];

 			$this->default_namespace = $this->namespaces[$prefix];

 		} else {

 			$this->message[$pos]['namespace'] = $this->default_namespace;

 		}

-        if($this->status == 'header'){

+        if ($this->status == 'header') {

         	if ($this->root_header != $pos) {

-	        	$this->responseHeaders .= "<" . (isset($prefix) ? $prefix . ':' : '') . "$name$attstr>";

+	        	$this->responseHeaders .= "<".(isset($prefix) ? $prefix.':' : '')."$name$attstr>";

 	        }

-        } elseif($this->root_struct_name != ''){

-        	$this->document .= "<" . (isset($prefix) ? $prefix . ':' : '') . "$name$attstr>";

+        } elseif ($this->root_struct_name != '') {

+        	$this->document .= "<".(isset($prefix) ? $prefix.':' : '')."$name$attstr>";

         }

 	}

 

@@ -314,27 +314,27 @@ 
 		$pos = $this->depth_array[$this->depth--];

 

         // get element prefix

-		if(strpos($name,':')){

+		if (strpos($name, ':')) {

 			// get ns prefix

-			$prefix = substr($name,0,strpos($name,':'));

+			$prefix = substr($name, 0, strpos($name, ':'));

 			// get unqualified name

-			$name = substr(strstr($name,':'),1);

+			$name = substr(strstr($name, ':'), 1);

 		}

 

 		// build to native type

-		if(isset($this->body_position) && $pos > $this->body_position){

+		if (isset($this->body_position) && $pos > $this->body_position) {

 			// deal w/ multirefs

-			if(isset($this->message[$pos]['attrs']['href'])){

+			if (isset($this->message[$pos]['attrs']['href'])) {

 				// get id

-				$id = substr($this->message[$pos]['attrs']['href'],1);

+				$id = substr($this->message[$pos]['attrs']['href'], 1);

 				// add placeholder to href array

 				$this->multirefs[$id][$pos] = 'placeholder';

 				// add set a reference to it as the result value

-				$this->message[$pos]['result'] =& $this->multirefs[$id][$pos];

+				$this->message[$pos]['result'] = & $this->multirefs[$id][$pos];

             // build complexType values

-			} elseif($this->message[$pos]['children'] != ''){

+			} elseif ($this->message[$pos]['children'] != '') {

 				// if result has already been generated (struct/array)

-				if(!isset($this->message[$pos]['result'])){

+				if (!isset($this->message[$pos]['result'])) {

 					$this->message[$pos]['result'] = $this->buildVal($pos);

 				}

 			// build complexType values of attributes and possibly simpleContent

@@ -384,15 +384,15 @@ 
 		}

 

         // for doclit

-        if($this->status == 'header'){

+        if ($this->status == 'header') {

         	if ($this->root_header != $pos) {

-	        	$this->responseHeaders .= "</" . (isset($prefix) ? $prefix . ':' : '') . "$name>";

+	        	$this->responseHeaders .= "</".(isset($prefix) ? $prefix.':' : '')."$name>";

 	        }

-        } elseif($pos >= $this->root_struct){

-        	$this->document .= "</" . (isset($prefix) ? $prefix . ':' : '') . "$name>";

+        } elseif ($pos >= $this->root_struct) {

+        	$this->document .= "</".(isset($prefix) ? $prefix.':' : '')."$name>";

         }

 		// switch status

-		if ($pos == $this->root_struct){

+		if ($pos == $this->root_struct) {

 			$this->status = 'body';

 			$this->root_struct_namespace = $this->message[$pos]['namespace'];

 		} elseif ($pos == $this->root_header) {

@@ -418,17 +418,17 @@ 
 	function character_data($parser, $data)

     {

 		$pos = $this->depth_array[$this->depth];

-		if ($this->xml_encoding == 'UTF-8'){

+		if ($this->xml_encoding == 'UTF-8') {

 			// TODO: add an option to disable this for folks who want

 			// raw UTF-8 that, e.g., might not map to iso-8859-1

 			// TODO: this can also be handled with xml_parser_set_option($this->parser, XML_OPTION_TARGET_ENCODING, "ISO-8859-1");

-			if($this->decode_utf8){

+			if ($this->decode_utf8) {

 				$data = utf8_decode($data);

 			}

 		}

         $this->message[$pos]['cdata'] .= $data;

         // for doclit

-        if($this->status == 'header'){

+        if ($this->status == 'header') {

         	$this->responseHeaders .= $data;

         } else {

         	$this->document .= $data;

@@ -442,7 +442,7 @@ 
 	* @access   public

 	* @deprecated	use get_soapbody instead

 	*/

-	function get_response(){

+	function get_response() {

 		return $this->soapresponse;

 	}

 

@@ -452,7 +452,7 @@ 
 	* @return	mixed

 	* @access   public

 	*/

-	function get_soapbody(){

+	function get_soapbody() {

 		return $this->soapresponse;

 	}

 

@@ -462,7 +462,7 @@ 
 	* @return	mixed

 	* @access   public

 	*/

-	function get_soapheader(){

+	function get_soapheader() {

 		return $this->soapheader;

 	}

 

@@ -472,7 +472,7 @@ 
 	* @return	string XML or empty if no Header

 	* @access   public

 	*/

-	function getHeaders(){

+	function getHeaders() {

 	    return $this->responseHeaders;

 	}

 

@@ -529,40 +529,40 @@ 
 	* @return	mixed	PHP value

 	* @access   private

 	*/

-	function buildVal($pos){

-		if(!isset($this->message[$pos]['type'])){

+	function buildVal($pos) {

+		if (!isset($this->message[$pos]['type'])) {

 			$this->message[$pos]['type'] = '';

 		}

 		$this->debug('in buildVal() for '.$this->message[$pos]['name']."(pos $pos) of type ".$this->message[$pos]['type']);

 		// if there are children...

-		if($this->message[$pos]['children'] != ''){

+		if ($this->message[$pos]['children'] != '') {

 			$this->debug('in buildVal, there are children');

-			$children = explode('|',$this->message[$pos]['children']);

+			$children = explode('|', $this->message[$pos]['children']);

 			array_shift($children); // knock off empty

 			// md array

-			if(isset($this->message[$pos]['arrayCols']) && $this->message[$pos]['arrayCols'] != ''){

-            	$r=0; // rowcount

-            	$c=0; // colcount

-            	foreach($children as $child_pos){

+			if (isset($this->message[$pos]['arrayCols']) && $this->message[$pos]['arrayCols'] != '') {

+            	$r = 0; // rowcount

+            	$c = 0; // colcount

+            	foreach ($children as $child_pos) {

 					$this->debug("in buildVal, got an MD array element: $r, $c");

 					$params[$r][] = $this->message[$child_pos]['result'];

 				    $c++;

-				    if($c == $this->message[$pos]['arrayCols']){

+				    if ($c == $this->message[$pos]['arrayCols']) {

 				    	$c = 0;

 						$r++;

 				    }

                 }

             // array

-			} elseif($this->message[$pos]['type'] == 'array' || $this->message[$pos]['type'] == 'Array'){

+			} elseif ($this->message[$pos]['type'] == 'array' || $this->message[$pos]['type'] == 'Array') {

                 $this->debug('in buildVal, adding array '.$this->message[$pos]['name']);

-                foreach($children as $child_pos){

+                foreach ($children as $child_pos) {

                 	$params[] = &$this->message[$child_pos]['result'];

                 }

             // apache Map type: java hashtable

-            } elseif($this->message[$pos]['type'] == 'Map' && $this->message[$pos]['type_namespace'] == 'http://xml.apache.org/xml-soap'){

+            } elseif ($this->message[$pos]['type'] == 'Map' && $this->message[$pos]['type_namespace'] == 'http://xml.apache.org/xml-soap') {

                 $this->debug('in buildVal, Java Map '.$this->message[$pos]['name']);

-                foreach($children as $child_pos){

-                	$kv = explode("|",$this->message[$child_pos]['children']);

+                foreach ($children as $child_pos) {

+                	$kv = explode("|", $this->message[$child_pos]['children']);

                    	$params[$this->message[$kv[1]]['result']] = &$this->message[$kv[2]]['result'];

                 }

             // generic compound type

@@ -576,8 +576,8 @@ 
 					$notstruct = 0;

 	            }

             	//

-            	foreach($children as $child_pos){

-            		if($notstruct){

+            	foreach ($children as $child_pos) {

+            		if ($notstruct) {

             			$params[] = &$this->message[$child_pos]['result'];

             		} else {

             			if (isset($params[$this->message[$child_pos]['name']])) {

main/inc/lib/nusoap/class.wsdlcache.php

Spacing +5 added lines, -5 removed lines

@@ -45,7 +45,7 @@ 
 	* @param integer $cache_lifetime lifetime for caching-files in seconds or 0 for unlimited

 	* @access public

 	*/

-	function __construct($cache_dir='.', $cache_lifetime=0) {

+	function __construct($cache_dir = '.', $cache_lifetime = 0) {

 		$this->fplock = array();

 		$this->cache_dir = $cache_dir != '' ? $cache_dir : '.';

 		$this->cache_lifetime = $cache_lifetime;

@@ -59,7 +59,7 @@ 
 	* @access private

 	*/

 	function createFilename($wsdl) {

-		return $this->cache_dir.'/wsdlcache-' . md5($wsdl);

+		return $this->cache_dir.'/wsdlcache-'.md5($wsdl);

 	}

 

 	/**

@@ -68,7 +68,7 @@ 
 	* @param    string $string debug data

 	* @access   private

 	*/

-	function debug($string){

+	function debug($string) {

 		$this->debug_str .= get_class($this).": $string\n";

 	}

 

@@ -147,7 +147,7 @@ 
 		$s = serialize($wsdl_instance);

 		if ($this->obtainMutex($filename, "w")) {

 			$fp = fopen($filename, "w");

-			if (! $fp) {

+			if (!$fp) {

 				$this->debug("Cannot write $wsdl_instance->wsdl ($filename) in cache");

 				$this->releaseMutex($filename);

 				return false;

@@ -174,7 +174,7 @@ 
 		$ret = flock($this->fplock[md5($filename)], LOCK_UN);

 		fclose($this->fplock[md5($filename)]);

 		unset($this->fplock[md5($filename)]);

-		if (! $ret) {

+		if (!$ret) {

 			$this->debug("Not able to release lock for $filename");

 		}

 		return $ret;

main/inc/lib/nusoap/class.soap_fault.php

Spacing +3 added lines, -3 removed lines

@@ -43,7 +43,7 @@ 
     * @param string $faultstring human readable error message

     * @param mixed $faultdetail detail, typically a string or array of string

 	*/

-	public function __construct($faultcode,$faultactor='',$faultstring='',$faultdetail=''){

+	public function __construct($faultcode, $faultactor = '', $faultstring = '', $faultdetail = '') {

 		parent::__construct();

 		$this->faultcode = $faultcode;

 		$this->faultactor = $faultactor;

@@ -57,9 +57,9 @@ 
 	* @return	string	The serialization of the fault instance.

 	* @access   public

 	*/

-	function serialize(){

+	function serialize() {

 		$ns_string = '';

-		foreach($this->namespaces as $k => $v){

+		foreach ($this->namespaces as $k => $v) {

 			$ns_string .= "\n  xmlns:$k=\"$v\"";

 		}

 		$return_msg =

main/inc/lib/nusoap/class.soap_transport_http.php

Spacing +136 added lines, -136 removed lines

@@ -26,18 +26,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'

@@ -54,7 +54,7 @@ 
 	* @param boolean $use_curl Whether to try to force cURL use

 	* @access public

 	*/

-	function __construct($url, $curl_options = NULL, $use_curl = false){

+	function __construct($url, $curl_options = NULL, $use_curl = false) {

 		parent::__construct();

 		$this->debug("ctor url=$url use_curl=$use_curl curl_options:");

 		$this->appendDebug($this->varDump($curl_options));

@@ -63,7 +63,7 @@ 
 			$this->ch_options = $curl_options;

 		}

 		$this->use_curl = $use_curl;

-		preg_match('/\$Revisio' . 'n: ([^ ]+)/', $this->revision, $rev);

+		preg_match('/\$Revisio'.'n: ([^ ]+)/', $this->revision, $rev);

 		$this->setHeader('User-Agent', $this->title.'/'.$this->version.' ('.$rev[1].')');

 	}

 

@@ -115,19 +115,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'] != ''){

-            $this->path .= '?' . $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;

@@ -171,7 +171,7 @@ 
 	* @return	boolean true if connected, false if not

 	* @access   private

 	*/

-	function connect($connection_timeout=0,$response_timeout=30){

+	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

@@ -195,7 +195,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;

@@ -206,20 +206,20 @@ 
 

 		// munge host if using OpenSSL

 		if ($this->scheme == 'ssl') {

-			$host = 'ssl://' . $host;

+			$host = 'ssl://'.$host;

 		}

-		$this->debug('calling fsockopen with host ' . $host . ' connection_timeout ' . $connection_timeout);

+		$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) {

-			$msg = 'Couldn\'t open socket connection to server ' . $this->url;

+		if (!$this->fp) {

+			$msg = 'Couldn\'t open socket connection to server '.$this->url;

 			if ($this->errno) {

 				$msg .= ', Error ('.$this->errno.'): '.$this->error_str;

 			} else {

@@ -231,8 +231,8 @@ 
 		}

 

 		// set response timeout

-		$this->debug('set response timeout to ' . $response_timeout);

-		socket_set_timeout( $this->fp, $response_timeout);

+		$this->debug('set response timeout to '.$response_timeout);

+		socket_set_timeout($this->fp, $response_timeout);

 

 		$this->debug('socket connected');

 		return true;

@@ -391,8 +391,8 @@ 
 		$this->debug('cURL connection set up');

 		return true;

 	  } else {

-		$this->setError('Unknown scheme ' . $this->scheme);

-		$this->debug('Unknown scheme ' . $this->scheme);

+		$this->setError('Unknown scheme '.$this->scheme);

+		$this->debug('Unknown scheme '.$this->scheme);

 		return false;

 	  }

 	}

@@ -407,7 +407,7 @@ 
 	* @return	string data

 	* @access   public

 	*/

-	function send($data, $timeout=0, $response_timeout=30, $cookies=NULL) {

+	function send($data, $timeout = 0, $response_timeout = 30, $cookies = NULL) {

 

 		$this->debug('entered send() with data of length: '.strlen($data));

 

@@ -417,12 +417,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;

 				}

 

@@ -448,7 +448,7 @@ 
 	* @access   public

 	* @deprecated

 	*/

-	function sendHTTPS($data, $timeout=0, $response_timeout=30, $cookies) {

+	function sendHTTPS($data, $timeout = 0, $response_timeout = 30, $cookies) {

 		return $this->send($data, $timeout, $response_timeout, $cookies);

 	}

 

@@ -469,7 +469,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;

@@ -477,16 +477,16 @@ 
 				// 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);

 

 				// A2 = Method ":" digest-uri-value

-				$A2 = $this->request_method . ':' . $this->digest_uri;

+				$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:

@@ -503,19 +503,19 @@ 
 				$nonce = isset($digestRequest['nonce']) ? $digestRequest['nonce'] : '';

 				$cnonce = $nonce;

 				if ($digestRequest['qop'] != '') {

-					$unhashedDigest = $HA1 . ':' . $nonce . ':' . sprintf("%08d", $digestRequest['nc']) . ':' . $cnonce . ':' . $digestRequest['qop'] . ':' . $HA2;

+					$unhashedDigest = $HA1.':'.$nonce.':'.sprintf("%08d", $digestRequest['nc']).':'.$cnonce.':'.$digestRequest['qop'].':'.$HA2;

 				} else {

-					$unhashedDigest = $HA1 . ':' . $nonce . ':' . $HA2;

+					$unhashedDigest = $HA1.':'.$nonce.':'.$HA2;

 				}

 

 				$hashedDigest = md5($unhashedDigest);

 

 				$opaque = '';

 				if (isset($digestRequest['opaque'])) {

-					$opaque = ', opaque="' . $digestRequest['opaque'] . '"';

+					$opaque = ', opaque="'.$digestRequest['opaque'].'"';

 				}

 

-				$this->setHeader('Authorization', 'Digest username="' . $username . '", realm="' . $digestRequest['realm'] . '", nonce="' . $nonce . '", uri="' . $this->digest_uri . $opaque . '", cnonce="' . $cnonce . '", nc=' . sprintf("%08x", $digestRequest['nc']) . ', qop="' . $digestRequest['qop'] . '", response="' . $hashedDigest . '"');

+				$this->setHeader('Authorization', 'Digest username="'.$username.'", realm="'.$digestRequest['realm'].'", nonce="'.$nonce.'", uri="'.$this->digest_uri.$opaque.'", cnonce="'.$cnonce.'", nc='.sprintf("%08x", $digestRequest['nc']).', qop="'.$digestRequest['qop'].'", response="'.$hashedDigest.'"');

 			}

 		} elseif ($authtype == 'certificate') {

 			$this->certRequest = $certRequest;

@@ -537,7 +537,7 @@ 
 	* @access   public

 	*/

 	function setSOAPAction($soapaction) {

-		$this->setHeader('SOAPAction', '"' . $soapaction . '"');

+		$this->setHeader('SOAPAction', '"'.$soapaction.'"');

 	}

 

 	/**

@@ -546,7 +546,7 @@ 
 	* @param    string $enc encoding style. supported values: gzip, deflate, or both

 	* @access   public

 	*/

-	function setEncoding($enc='gzip, deflate') {

+	function setEncoding($enc = 'gzip, deflate') {

 		if (function_exists('gzdeflate')) {

 			$this->protocol_version = '1.1';

 			$this->setHeader('Accept-Encoding', $enc);

@@ -599,7 +599,7 @@ 
 	 * @access	private

 	 */

 	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',

@@ -625,7 +625,7 @@ 
 	* @access   public

 	* @deprecated

 	*/

-	function decodeChunked($buffer, $lb){

+	function decodeChunked($buffer, $lb) {

 		// length := 0

 		$length = 0;

 		$new = '';

@@ -637,17 +637,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);

@@ -655,7 +655,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

@@ -667,8 +667,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;

@@ -703,7 +703,7 @@ 
 		$this->outgoing_payload = "$req\r\n";

 

 		// loop thru headers, serializing

-		foreach($this->outgoing_headers as $k => $v){

+		foreach ($this->outgoing_headers as $k => $v) {

 			$hdr = $k.': '.$v;

 			$this->debug("HTTP header: $hdr");

 			$this->outgoing_payload .= "$hdr\r\n";

@@ -740,12 +740,12 @@ 
 

 	  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;

 		}

-		$this->debug('wrote data to socket, length = ' . strlen($this->outgoing_payload));

+		$this->debug('wrote data to socket, length = '.strlen($this->outgoing_payload));

 		return true;

 	  } else if ($this->io_method() == 'curl') {

 		// set payload

@@ -754,7 +754,7 @@ 
 		// some servers refuse to work with (so we no longer use this method!)

 		//$this->setCurlOption(CURLOPT_CUSTOMREQUEST, $this->outgoing_payload);

 		$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 {

@@ -762,7 +762,7 @@ 
 			}

 		}

 		if ($cookie_str != '') {

-			$curl_headers[] = 'Cookie: ' . $cookie_str;

+			$curl_headers[] = 'Cookie: '.$cookie_str;

 		}

 		$this->setCurlOption(CURLOPT_HTTPHEADER, $curl_headers);

 		$this->debug('set cURL HTTP headers');

@@ -788,62 +788,62 @@ 
 	* @return	string the response (also sets member variables like incoming_payload)

 	* @access   private

 	*/

-	function getResponse(){

+	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);

+				$this->debug('found no headers before EOF after length '.strlen($data));

+				$this->debug("received before EOF:\n".$data);

 				$this->setError('server failed to send headers');

 				return false;

 			}

 

 			$tmp = fgets($this->fp, 256);

 			$tmplen = strlen($tmp);

-			$this->debug("read line of $tmplen bytes: " . trim($tmp));

+			$this->debug("read line of $tmplen bytes: ".trim($tmp));

 

 			if ($tmplen == 0) {

 				$this->incoming_payload = $data;

-				$this->debug('socket read of headers timed out after length ' . strlen($data));

-				$this->debug("read before timeout: " . $data);

+				$this->debug('socket read of headers timed out after length '.strlen($data));

+				$this->debug("read before timeout: ".$data);

 				$this->setError('socket read of headers timed out');

 				return false;

 			}

 

 			$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 = '';

 			}//

 		}

 		// store header data

 		$this->incoming_payload .= $data;

-		$this->debug('found end of headers after length ' . strlen($data));

+		$this->debug('found end of headers after length '.strlen($data));

 		// process headers

-		$header_data = trim(substr($data,0,$pos));

-		$header_array = explode($lb,$header_data);

+		$header_data = trim(substr($data, 0, $pos));

+		$header_array = explode($lb, $header_data);

 		$this->incoming_headers = array();

 		$this->incoming_cookies = array();

-		foreach($header_array as $header_line){

-			$arr = explode(':',$header_line, 2);

-			if(count($arr) > 1){

+		foreach ($header_array as $header_line) {

+			$arr = explode(':', $header_line, 2);

+			if (count($arr) > 1) {

 				$header_name = strtolower(trim($arr[0]));

 				$this->incoming_headers[$header_name] = trim($arr[1]);

 				if ($header_name == 'set-cookie') {

@@ -851,20 +851,20 @@ 
 					$cookie = $this->parseCookie(trim($arr[1]));

 					if ($cookie) {

 						$this->incoming_cookies[] = $cookie;

-						$this->debug('found cookie: ' . $cookie['name'] . ' = ' . $cookie['value']);

+						$this->debug('found cookie: '.$cookie['name'].' = '.$cookie['value']);

 					} else {

-						$this->debug('did not find cookie in ' . trim($arr[1]));

+						$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;

+				$this->incoming_headers[$header_name] .= $lb.' '.$header_line;

 			}

 		}

 

 		// 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");

 		}

@@ -884,8 +884,8 @@ 
 				$this->debug("read chunk line of $tmplen bytes");

 				if ($tmplen == 0) {

 					$this->incoming_payload = $data;

-					$this->debug('socket read of chunk length timed out after length ' . strlen($data));

-					$this->debug("read before timeout:\n" . $data);

+					$this->debug('socket read of chunk length timed out after length '.strlen($data));

+					$this->debug("read before timeout:\n".$data);

 					$this->setError('socket read of chunk length timed out');

 					return false;

 				}

@@ -900,8 +900,8 @@ 
 				$this->debug("read buffer of $tmplen bytes");

 				if (($tmplen == 0) && (!feof($this->fp))) {

 					$this->incoming_payload = $data;

-					$this->debug('socket read of body timed out after length ' . strlen($data));

-					$this->debug("read before timeout:\n" . $data);

+					$this->debug('socket read of body timed out after length '.strlen($data));

+					$this->debug("read before timeout:\n".$data);

 					$this->setError('socket read of body timed out');

 					return false;

 				}

@@ -914,8 +914,8 @@ 
 				$this->debug("read chunk terminator of $tmplen bytes");

 				if ($tmplen == 0) {

 					$this->incoming_payload = $data;

-					$this->debug('socket read of chunk terminator timed out after length ' . strlen($data));

-					$this->debug("read before timeout:\n" . $data);

+					$this->debug('socket read of chunk terminator timed out after length '.strlen($data));

+					$this->debug("read before timeout:\n".$data);

 					$this->setError('socket read of chunk terminator timed out');

 					return false;

 				}

@@ -924,21 +924,21 @@ 
 		if (feof($this->fp)) {

 			$this->debug('read to EOF');

 		}

-		$this->debug('read body of length ' . strlen($data));

+		$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');

 

 		// 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;

 		}

@@ -964,7 +964,7 @@ 
 		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

-			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));

 		// 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') {

@@ -1029,14 +1029,14 @@ 
 					$cookie = $this->parseCookie(trim($arr[1]));

 					if ($cookie) {

 						$this->incoming_cookies[] = $cookie;

-						$this->debug('found cookie: ' . $cookie['name'] . ' = ' . $cookie['value']);

+						$this->debug('found cookie: '.$cookie['name'].' = '.$cookie['value']);

 					} else {

-						$this->debug('did not find cookie in ' . trim($arr[1]));

+						$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;

+				$this->incoming_headers[$header_name] .= $lb.' '.$header_line;

 			}

 		}

 	  }

@@ -1049,7 +1049,7 @@ 
 

  		// see if we need to resend the request with http digest authentication

  		if (isset($this->incoming_headers['location']) && ($http_status == 301 || $http_status == 302)) {

- 			$this->debug("Got $http_status $http_reason with Location: " . $this->incoming_headers['location']);

+ 			$this->debug("Got $http_status $http_reason with Location: ".$this->incoming_headers['location']);

  			$this->setURL($this->incoming_headers['location']);

 			$this->tryagain = true;

 			return false;

@@ -1057,7 +1057,7 @@ 
 

  		// see if we need to resend the request with http digest authentication

  		if (isset($this->incoming_headers['www-authenticate']) && $http_status == 401) {

- 			$this->debug("Got 401 $http_reason with WWW-Authenticate: " . $this->incoming_headers['www-authenticate']);

+ 			$this->debug("Got 401 $http_reason with WWW-Authenticate: ".$this->incoming_headers['www-authenticate']);

  			if (strstr($this->incoming_headers['www-authenticate'], "Digest ")) {

  				$this->debug('Server wants digest authentication');

  				// remove "Digest " from our elements

@@ -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')) {

 					//$timer->setMarker('starting decoding of gzip/deflated content');

 					// 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

@@ -1104,13 +1104,13 @@ 
 					if ($this->incoming_headers['content-encoding'] == 'deflate') {

 						if ($degzdata = @gzinflate($data)) {

 	    					$data = $degzdata;

-	    					$this->debug('The payload has been inflated to ' . strlen($data) . ' bytes');

+	    					$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');

+			    					$this->debug('The payload has been inflated again to '.strlen($data).' bytes');

 								}

 	    					}

 	    				} else {

@@ -1120,13 +1120,13 @@ 
 					} 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');

+	    					$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');

+			    					$this->debug('The payload has been un-gzipped again to '.strlen($data).' bytes');

 								}

 	    					}

 	    				} else {

@@ -1143,14 +1143,14 @@ 
 					$this->setError('The server sent compressed data. Your php install must have the Zlib extension compiled in to support this.');

 				}

 			} else {

-				$this->debug('Unsupported Content-Encoding ' . $this->incoming_headers['content-encoding']);

-				$this->setError('Unsupported Content-Encoding ' . $this->incoming_headers['content-encoding']);

+				$this->debug('Unsupported Content-Encoding '.$this->incoming_headers['content-encoding']);

+				$this->setError('Unsupported Content-Encoding '.$this->incoming_headers['content-encoding']);

 			}

 		} else {

 			$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;

@@ -1167,7 +1167,7 @@ 
 	 * @access	public

 	 */

 	function setContentType($type, $charset = false) {

-		$this->setHeader('Content-Type', $type . ($charset ? '; charset=' . $charset : ''));

+		$this->setHeader('Content-Type', $type.($charset ? '; charset='.$charset : ''));

 	}

 

 	/**

@@ -1176,7 +1176,7 @@ 
 	 * @return	boolean whether the request was honored by this method.

 	 * @access	public

 	 */

-	function usePersistentConnection(){

+	function usePersistentConnection() {

 		if (isset($this->outgoing_headers['Accept-Encoding'])) {

 			return false;

 		}

@@ -1197,7 +1197,7 @@ 
 	 * TODO: allow a Set-Cookie string to be parsed into multiple cookies

 	 */

 	function parseCookie($cookie_str) {

-		$cookie_str = str_replace('; ', ';', $cookie_str) . ';';

+		$cookie_str = str_replace('; ', ';', $cookie_str).';';

 		$data = preg_split('/;/', $cookie_str);

 		$value_str = $data[0];

 

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

@@ -1240,7 +1240,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,

@@ -1260,40 +1260,40 @@ 
 	 * @return	string for Cookie-HTTP-Header

 	 * @access	private

 	 */

-	function getCookiesForRequest($cookies, $secure=false) {

+	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']))) {

+				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;

 				}

-				$cookie_str .= $cookie['name'] . '=' . $cookie['value'] . '; ';

-	    		$this->debug('add cookie to Cookie-String: ' . $cookie['name'] . '=' . $cookie['value']);

+				$cookie_str .= $cookie['name'].'='.$cookie['value'].'; ';

+	    		$this->debug('add cookie to Cookie-String: '.$cookie['name'].'='.$cookie['value']);

 			}

 		}

 		return $cookie_str;

main/inc/lib/nusoap/class.xmlschema.php

Spacing +138 added lines, -138 removed lines

@@ -48,7 +48,7 @@ 
 	* @param	string $namespaces namespaces defined in enclosing XML

 	* @access   public

 	*/

-	function __construct($schema='',$xml='',$namespaces=array()){

+	function __construct($schema = '', $xml = '', $namespaces = array()) {

 		parent::__construct();

 		$this->debug('nusoap_xmlschema class instantiated, inside constructor');

 		// files

@@ -60,13 +60,13 @@ 
 		$this->namespaces = array_merge($this->namespaces, $namespaces);

 

 		// parse schema file

-		if($schema != ''){

+		if ($schema != '') {

 			$this->debug('initial schema file: '.$schema);

 			$this->parseFile($schema, 'schema');

 		}

 

 		// parse xml file

-		if($xml != ''){

+		if ($xml != '') {

 			$this->debug('initial xml file: '.$xml);

 			$this->parseFile($xml, 'xml');

 		}

@@ -81,18 +81,18 @@ 
 	* @return boolean

     * @access public

     */

-	function parseFile($xml,$type){

+	function parseFile($xml, $type) {

 		// parse xml file

-		if($xml != ""){

-			$xmlStr = @join("",@file($xml));

-			if($xmlStr == ""){

+		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;

 			}

@@ -107,9 +107,9 @@ 
     * @param	string $type (schema|xml)

 	* @access   private

 	*/

-	function parseString($xml,$type){

+	function parseString($xml, $type) {

 		// parse xml string

-		if($xml != ""){

+		if ($xml != "") {

 

 	    	// Create an XML parser.

 	    	$this->parser = xml_parser_create();

@@ -120,28 +120,28 @@ 
 	    	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),

 				xml_error_string(xml_get_error_code($this->parser))

 				);

 				$this->debug($errstr);

-				$this->debug("XML payload:\n" . $xml);

+				$this->debug("XML payload:\n".$xml);

 				$this->setError($errstr);

 	    	}

 

 			xml_parser_free($this->parser);

-		} else{

+		} else {

 			$this->debug('no xml passed to parseString()!!');

 			$this->setError('no xml passed to parseString()!!');

 		}

@@ -157,9 +157,9 @@ 
 	function CreateTypeName($ename) {

 		$scope = '';

 		for ($i = 0; $i < count($this->complexTypeStack); $i++) {

-			$scope .= $this->complexTypeStack[$i] . '_';

+			$scope .= $this->complexTypeStack[$i].'_';

 		}

-		return $scope . $ename . '_ContainedType';

+		return $scope.$ename.'_ContainedType';

 	}

 

 	/**

@@ -185,7 +185,7 @@ 
 		}

 

 		// get element prefix

-		if($prefix = $this->getPrefix($name)){

+		if ($prefix = $this->getPrefix($name)) {

 			// get unqualified name

 			$name = $this->getLocalPart($name);

 		} else {

@@ -193,31 +193,31 @@ 
         }

 

         // 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 (preg_match('/^xmlns/', $k)) {

                 	//$this->xdebug("$k: $v");

                 	//$this->xdebug('ns_prefix: '.$this->getPrefix($k));

-                	if($ns_prefix = substr(strrchr($k,':'),1)){

+                	if ($ns_prefix = substr(strrchr($k, ':'), 1)) {

                 		//$this->xdebug("Add namespace[$ns_prefix] = $v");

 						$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';

 					}

 				}

         	}

-        	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,41 +250,41 @@ 
 						// no namespace in arrayType attribute value...

 						if ($this->defaultNamespace[$pos]) {

 							// ...so use the default

-							$attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'] = $this->defaultNamespace[$pos] . ':' . $attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'];

+							$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'){

+				} 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 = 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;

@@ -295,7 +295,7 @@ 
 			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']);

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

@@ -318,7 +318,7 @@ 
 					}

 				} else {

 					$name = $this->CreateTypeName($this->currentElement);

-					$this->xdebug('processing unnamed complexType for element ' . $this->currentElement . ' named ' . $name);

+					$this->xdebug('processing unnamed complexType for element '.$this->currentElement.' named '.$name);

 					$this->currentComplexType = $name;

 					//$this->currentElement = false;

 					$this->complexTypes[$this->currentComplexType] = $attrs;

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

@@ -349,12 +349,12 @@ 
 						$attrs['form'] = 'qualified';

 					}

 				}

-				if(isset($attrs['type'])){

+				if (isset($attrs['type'])) {

 					$this->xdebug("processing typed element ".$attrs['name']." of type ".$attrs['type']);

-					if (! $this->getPrefix($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']);

+							$attrs['type'] = $this->defaultNamespace[$pos].':'.$attrs['type'];

+							$this->xdebug('used default namespace to make type '.$attrs['type']);

 						}

 					}

 					// This is for constructs like

@@ -365,20 +365,20 @@ 
 					//                </sequence>

 					//            </complexType>

 					if ($this->currentComplexType && $this->complexTypes[$this->currentComplexType]['phpType'] == 'array') {

-						$this->xdebug('arrayType for unusual array is ' . $attrs['type']);

+						$this->xdebug('arrayType for unusual array is '.$attrs['type']);

 						$this->complexTypes[$this->currentComplexType]['arrayType'] = $attrs['type'];

 					}

 					$this->currentElement = $attrs['name'];

 					$ename = $attrs['name'];

-				} elseif(isset($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']);

-					$this->xdebug("processing untyped element " . $attrs['name'] . ' type ' . $type);

+					$type = $this->CreateTypeName($this->currentComplexType.'_'.$attrs['name']);

+					$this->xdebug("processing untyped element ".$attrs['name'].' type '.$type);

 					$this->currentElement = $attrs['name'];

-					$attrs['type'] = $this->schemaTargetNamespace . ':' . $type;

+					$attrs['type'] = $this->schemaTargetNamespace.':'.$type;

 					$ename = $attrs['name'];

 				}

 				if (isset($ename) && $this->currentComplexType) {

@@ -386,12 +386,12 @@ 
 					$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

-				$this->xdebug('enumeration ' . $attrs['value']);

+				$this->xdebug('enumeration '.$attrs['value']);

 				if ($this->currentSimpleType) {

 					$this->simpleTypes[$this->currentSimpleType]['enumeration'][] = $attrs['value'];

 				} elseif ($this->currentComplexType) {

@@ -399,11 +399,11 @@ 
 				}

 			break;

 			case 'extension':	// simpleContent or complexContent type extension

-				$this->xdebug('extension ' . $attrs['base']);

+				$this->xdebug('extension '.$attrs['base']);

 				if ($this->currentComplexType) {

 					$ns = $this->getPrefix($attrs['base']);

 					if ($ns == '') {

-						$this->complexTypes[$this->currentComplexType]['extensionBase'] = $this->schemaTargetNamespace . ':' . $attrs['base'];

+						$this->complexTypes[$this->currentComplexType]['extensionBase'] = $this->schemaTargetNamespace.':'.$attrs['base'];

 					} else {

 						$this->complexTypes[$this->currentComplexType]['extensionBase'] = $attrs['base'];

 					}

@@ -413,19 +413,19 @@ 
 			break;

 			case 'import':

 			    if (isset($attrs['schemaLocation'])) {

-					$this->xdebug('import namespace ' . $attrs['namespace'] . ' from ' . $attrs['schemaLocation']);

+					$this->xdebug('import namespace '.$attrs['namespace'].' from '.$attrs['schemaLocation']);

                     $this->imports[$attrs['namespace']][] = array('location' => $attrs['schemaLocation'], 'loaded' => false);

 				} else {

-					$this->xdebug('import namespace ' . $attrs['namespace']);

+					$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;

 			case 'include':

 			    if (isset($attrs['schemaLocation'])) {

-					$this->xdebug('include into namespace ' . $this->schemaTargetNamespace . ' from ' . $attrs['schemaLocation']);

+					$this->xdebug('include into namespace '.$this->schemaTargetNamespace.' from '.$attrs['schemaLocation']);

                     $this->imports[$this->schemaTargetNamespace][] = array('location' => $attrs['schemaLocation'], 'loaded' => false);

 				} else {

 					$this->xdebug('ignoring invalid XML Schema construct: include without schemaLocation attribute');

@@ -435,12 +435,12 @@ 
 				$this->xdebug("do nothing for element $name");

 			break;

 			case 'restriction':	// simpleType, simpleContent or complexContent value restriction

-				$this->xdebug('restriction ' . $attrs['base']);

-				if($this->currentSimpleType){

+				$this->xdebug('restriction '.$attrs['base']);

+				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';

 					}

 				}

@@ -467,15 +467,15 @@ 
 			break;

 			case 'simpleType':

 				array_push($this->simpleTypeStack, $this->currentSimpleType);

-				if(isset($attrs['name'])){

-					$this->xdebug("processing simpleType for name " . $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);

+					$name = $this->CreateTypeName($this->currentComplexType.'_'.$this->currentElement);

+					$this->xdebug('processing unnamed simpleType for element '.$this->currentElement.' named '.$name);

 					$this->currentSimpleType = $name;

 					//$this->currentElement = false;

 					$this->simpleTypes[$this->currentSimpleType] = $attrs;

@@ -501,29 +501,29 @@ 
 		// 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'){

-			$this->xdebug('done processing complexType ' . ($this->currentComplexType ? $this->currentComplexType : '(unknown)'));

+		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);

 			//$this->currentElement = false;

 		}

-		if($name == 'element'){

-			$this->xdebug('done processing element ' . ($this->currentElement ? $this->currentElement : '(unknown)'));

+		if ($name == 'element') {

+			$this->xdebug('done processing element '.($this->currentElement ? $this->currentElement : '(unknown)'));

 			$this->currentElement = array_pop($this->elementStack);

 		}

-		if($name == 'simpleType'){

-			$this->xdebug('done processing simpleType ' . ($this->currentSimpleType ? $this->currentSimpleType : '(unknown)'));

+		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);

 		}

@@ -536,7 +536,7 @@ 
 	* @param    string $data element content

 	* @access   private

 	*/

-	function schemaCharacterData($parser, $data){

+	function schemaCharacterData($parser, $data) {

 		$pos = $this->depth_array[$this->depth - 1];

 		$this->message[$pos]['cdata'] .= $data;

 	}

@@ -546,32 +546,32 @@ 
 	*

 	* @access   public

 	*/

-	function serializeSchema(){

+	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";

+						$xml .= " <$schemaPrefix:import location=\"".$ii['location'].'" namespace="'.$ns."\" />\n";

 					} else {

-						$xml .= " <$schemaPrefix:import namespace=\"" . $ns . "\" />\n";

+						$xml .= " <$schemaPrefix:import namespace=\"".$ns."\" />\n";

 					}

 				}

 			}

 		}

 		// 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']) . "\"";

+						$contentStr .= "   <$schemaPrefix:element name=\"$element\" type=\"".$this->contractQName($eParts['type'])."\"";

 						foreach ($eParts as $aName => $aValue) {

 							// handle, e.g., abstract, default, form, minOccurs, maxOccurs, nillable

 							if ($aName != 'name' && $aName != 'type') {

@@ -587,8 +587,8 @@ 
 				}

 			}

 			// 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') {

@@ -604,15 +604,15 @@ 
 				}

 			}

 			// if restriction

-			if (isset($attrs['restrictionBase']) && $attrs['restrictionBase'] != ''){

+			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)){

+				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 != ''){

+			if ($contentStr != '') {

 				$contentStr = " <$schemaPrefix:complexType name=\"$typeName\">\n".$contentStr." </$schemaPrefix:complexType>\n";

 			} else {

 				$contentStr = " <$schemaPrefix:complexType name=\"$typeName\"/>\n";

@@ -620,8 +620,8 @@ 
 			$xml .= $contentStr;

 		}

 		// simple types

-		if(isset($this->simpleTypes) && count($this->simpleTypes) > 0){

-			foreach($this->simpleTypes as $typeName => $eParts){

+		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) {

@@ -632,14 +632,14 @@ 
 			}

 		}

 		// elements

-		if(isset($this->elements) && count($this->elements) > 0){

-			foreach($this->elements as $element => $eParts){

+		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){

+		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/>";

 			}

 		}

@@ -654,7 +654,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;

 	}

 

@@ -664,8 +664,8 @@ 
 	* @param    string $string debug data

 	* @access   private

 	*/

-	function xdebug($string){

-		$this->debug('<' . $this->schemaTargetNamespace . '> '.$string);

+	function xdebug($string) {

+		$this->debug('<'.$this->schemaTargetNamespace.'> '.$string);

 	}

 

     /**

@@ -680,11 +680,11 @@ 
     * @access public

     * @deprecated

     */

-	function getPHPType($type,$ns){

-		if(isset($this->typemap[$ns][$type])){

+	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'];

 		}

@@ -713,7 +713,7 @@ 
     * @see addSimpleType

     * @see addElement

     */

-	function getTypeDef($type){

+	function getTypeDef($type) {

 		//$this->debug("in getTypeDef for type $type");

 		if (substr($type, -1) == '^') {

 			$is_element = 1;

@@ -722,10 +722,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

@@ -745,7 +745,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

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

@@ -792,23 +792,23 @@ 
     * @access public

     * @deprecated

     */

-    function serializeTypeDef($type){

+    function serializeTypeDef($type) {

     	//print "in sTD() for type $type<br>";

-	if($typeDef = $this->getTypeDef($type)){

+	if ($typeDef = $this->getTypeDef($type)) {

 		$str .= '<'.$type;

-	    if(is_array($typeDef['attrs'])){

-		foreach($typeDef['attrs'] as $attName => $data){

+	    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){

+	    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 .= "/>";

@@ -828,22 +828,22 @@ 
     * @access public

     * @deprecated

 	*/

-	function typeToForm($name,$type){

+	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>";

 				}

 				$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>";

@@ -900,7 +900,7 @@ 
 	* @access public

 	* @see getTypeDef

 	*/

-	function addComplexType($name,$typeClass='complexType',$phpType='array',$compositor='',$restrictionBase='',$elements=array(),$attrs=array(),$arrayType=''){

+	function addComplexType($name, $typeClass = 'complexType', $phpType = 'array', $compositor = '', $restrictionBase = '', $elements = array(), $attrs = array(), $arrayType = '') {

 		$this->complexTypes[$name] = array(

 	    'name'		=> $name,

 	    'typeClass'	=> $typeClass,

@@ -928,7 +928,7 @@ 
 	* @see nusoap_xmlschema

 	* @see getTypeDef

 	*/

-	function addSimpleType($name, $restrictionBase='', $typeClass='simpleType', $phpType='scalar', $enumeration=array()) {

+	function addSimpleType($name, $restrictionBase = '', $typeClass = 'simpleType', $phpType = 'scalar', $enumeration = array()) {

 		$this->simpleTypes[$name] = array(

 	    'name'			=> $name,

 	    'typeClass'		=> $typeClass,

@@ -949,14 +949,14 @@ 
 	* @access public

 	*/

 	function addElement($attrs) {

-		if (! $this->getPrefix($attrs['type'])) {

-			$attrs['type'] = $this->schemaTargetNamespace . ':' . $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->xdebug("addElement ".$attrs['name']);

+		$this->appendDebug($this->varDump($this->elements[$attrs['name']]));

 	}

 }

 

src/Chamilo/UserBundle/Entity/Repository/UserRepository.php

Spacing +2 added lines, -2 removed lines

@@ -258,7 +258,7 @@ 
                         INNER JOIN ChamiloUserBundle:User AS U WITH UF.friendUserId = U
                         WHERE
                             U.status != 6 AND
-                            UF.relationType NOT IN(" . USER_RELATION_TYPE_DELETED . ", " . USER_RELATION_TYPE_RRHH . ") AND
+                            UF.relationType NOT IN(" . USER_RELATION_TYPE_DELETED.", ".USER_RELATION_TYPE_RRHH.") AND
                             UF.userId = $currentUserId AND
                             UF.friendUserId != $currentUserId AND
                             U = R.user AND
@@ -282,7 +282,7 @@ 
                 $dql = "SELECT DISTINCT U
                         FROM ChamiloUserBundle:User U
                         INNER JOIN ChamiloCoreBundle:TrackEOnline T WITH U.id = T.loginUserId
-                        WHERE T.loginDate >= '" . $limit_date . "'";
+                        WHERE T.loginDate >= '" . $limit_date."'";
             }
         }