YetiForceCompany / YetiForceCRM

libraries/nusoap/class.wsdl.php

Spacing +125 added lines, -127 removed lines

@@ -47,13 +47,13 @@ 
 	var $proxypassword = '';
 	var $timeout = 0;
 	var $response_timeout = 30;
-	var $curl_options = array();	// User-specified cURL options
-	var $use_curl = false;			// whether to always try to use cURL
+	var $curl_options = array(); // User-specified cURL options
+	var $use_curl = false; // whether to always try to use cURL
 	// for HTTP authentication
-	var $username = '';				// Username for HTTP authentication
-	var $password = '';				// Password for HTTP authentication
-	var $authtype = '';				// Type of HTTP authentication
-	var $certRequest = array();		// Certificate for HTTP SSL authentication
+	var $username = ''; // Username for HTTP authentication
+	var $password = ''; // Password for HTTP authentication
+	var $authtype = ''; // Type of HTTP authentication
+	var $certRequest = array(); // Certificate for HTTP SSL authentication
 
     /**
      * constructor
@@ -69,7 +69,7 @@ 
 	 * @param boolean $use_curl try to use cURL
      * @access public 
      */
-    public function wsdl($wsdl = '',$proxyhost=false,$proxyport=false,$proxyusername=false,$proxypassword=false,$timeout=0,$response_timeout=30,$curl_options=null,$use_curl=false){
+    public function wsdl($wsdl = '', $proxyhost = false, $proxyport = false, $proxyusername = false, $proxypassword = false, $timeout = 0, $response_timeout = 30, $curl_options = null, $use_curl = false) {
 		parent::nusoap_base();
 		$this->debug("ctor wsdl=$wsdl timeout=$timeout response_timeout=$response_timeout");
         $this->proxyhost = $proxyhost;
@@ -103,10 +103,10 @@ 
     		// Schema imports
     		foreach ($this->schemas as $ns => $list) {
     			foreach ($list as $xs) {
-					$wsdlparts = parse_url($this->wsdl);	// this is bogusly simple!
+					$wsdlparts = parse_url($this->wsdl); // this is bogusly simple!
 		            foreach ($xs->imports as $ns2 => $list2) {
 		                for ($ii = 0; $ii < count($list2); $ii++) {
-		                	if (! $list2[$ii]['loaded']) {
+		                	if (!$list2[$ii]['loaded']) {
 		                		/*
 		                		 * Substituted with line below
 		                		 * because of error "Warning: attempt to modify property of non-object"
@@ -117,10 +117,10 @@ 
 								if ($url != '') {
 									$urlparts = parse_url($url);
 									if (!isset($urlparts['host'])) {
-										$url = $wsdlparts['scheme'] . '://' . $wsdlparts['host'] . (isset($wsdlparts['port']) ? ':' .$wsdlparts['port'] : '') .
-												substr($wsdlparts['path'],0,strrpos($wsdlparts['path'],'/') + 1) .$urlparts['path'];
+										$url = $wsdlparts['scheme'] . '://' . $wsdlparts['host'] . (isset($wsdlparts['port']) ? ':' . $wsdlparts['port'] : '') .
+												substr($wsdlparts['path'], 0, strrpos($wsdlparts['path'], '/') + 1) . $urlparts['path'];
 									}
-									if (! in_array($url, $imported_urls)) {
+									if (!in_array($url, $imported_urls)) {
 					                	$this->parseWSDL($url);
 				                		$imported++;
 				                		$imported_urls[] = $url;
@@ -134,19 +134,19 @@ 
     			}
     		}
     		// WSDL imports
-			$wsdlparts = parse_url($this->wsdl);	// this is bogusly simple!
+			$wsdlparts = parse_url($this->wsdl); // this is bogusly simple!
             foreach ($this->import as $ns => $list) {
                 for ($ii = 0; $ii < count($list); $ii++) {
-                	if (! $list[$ii]['loaded']) {
+                	if (!$list[$ii]['loaded']) {
                 		$this->import[$ns][$ii]['loaded'] = true;
                 		$url = $list[$ii]['location'];
 						if ($url != '') {
 							$urlparts = parse_url($url);
 							if (!isset($urlparts['host'])) {
 								$url = $wsdlparts['scheme'] . '://' . $wsdlparts['host'] . (isset($wsdlparts['port']) ? ':' . $wsdlparts['port'] : '') .
-										substr($wsdlparts['path'],0,strrpos($wsdlparts['path'],'/') + 1) .$urlparts['path'];
+										substr($wsdlparts['path'], 0, strrpos($wsdlparts['path'], '/') + 1) . $urlparts['path'];
 							}
-							if (! in_array($url, $imported_urls)) {
+							if (!in_array($url, $imported_urls)) {
 			                	$this->parseWSDL($url);
 		                		$imported++;
 		                		$imported_urls[] = $url;
@@ -159,30 +159,28 @@ 
             } 
 		}
         // add new data to operation data
-        foreach($this->bindings as $binding => $bindingData) {
+        foreach ($this->bindings as $binding => $bindingData) {
             if (isset($bindingData['operations']) && is_array($bindingData['operations'])) {
-                foreach($bindingData['operations'] as $operation => $data) {
+                foreach ($bindingData['operations'] as $operation => $data) {
                     $this->debug('post-parse data gathering for ' . $operation);
                     $this->bindings[$binding]['operations'][$operation]['input'] = 
 						isset($this->bindings[$binding]['operations'][$operation]['input']) ? 
-						array_merge($this->bindings[$binding]['operations'][$operation]['input'], $this->portTypes[ $bindingData['portType'] ][$operation]['input']) :
-						$this->portTypes[ $bindingData['portType'] ][$operation]['input'];
+						array_merge($this->bindings[$binding]['operations'][$operation]['input'], $this->portTypes[$bindingData['portType']][$operation]['input']) : $this->portTypes[$bindingData['portType']][$operation]['input'];
                     $this->bindings[$binding]['operations'][$operation]['output'] = 
 						isset($this->bindings[$binding]['operations'][$operation]['output']) ?
-						array_merge($this->bindings[$binding]['operations'][$operation]['output'], $this->portTypes[ $bindingData['portType'] ][$operation]['output']) :
-						$this->portTypes[ $bindingData['portType'] ][$operation]['output'];
-                    if(isset($this->messages[ $this->bindings[$binding]['operations'][$operation]['input']['message'] ])){
-						$this->bindings[$binding]['operations'][$operation]['input']['parts'] = $this->messages[ $this->bindings[$binding]['operations'][$operation]['input']['message'] ];
+						array_merge($this->bindings[$binding]['operations'][$operation]['output'], $this->portTypes[$bindingData['portType']][$operation]['output']) : $this->portTypes[$bindingData['portType']][$operation]['output'];
+                    if (isset($this->messages[$this->bindings[$binding]['operations'][$operation]['input']['message']])) {
+						$this->bindings[$binding]['operations'][$operation]['input']['parts'] = $this->messages[$this->bindings[$binding]['operations'][$operation]['input']['message']];
 					}
-					if(isset($this->messages[ $this->bindings[$binding]['operations'][$operation]['output']['message'] ])){
-                   		$this->bindings[$binding]['operations'][$operation]['output']['parts'] = $this->messages[ $this->bindings[$binding]['operations'][$operation]['output']['message'] ];
+					if (isset($this->messages[$this->bindings[$binding]['operations'][$operation]['output']['message']])) {
+                   		$this->bindings[$binding]['operations'][$operation]['output']['parts'] = $this->messages[$this->bindings[$binding]['operations'][$operation]['output']['message']];
                     }
                     // Set operation style if necessary, but do not override one already provided
 					if (isset($bindingData['style']) && !isset($this->bindings[$binding]['operations'][$operation]['style'])) {
                         $this->bindings[$binding]['operations'][$operation]['style'] = $bindingData['style'];
                     }
                     $this->bindings[$binding]['operations'][$operation]['transport'] = isset($bindingData['transport']) ? $bindingData['transport'] : '';
-                    $this->bindings[$binding]['operations'][$operation]['documentation'] = isset($this->portTypes[ $bindingData['portType'] ][$operation]['documentation']) ? $this->portTypes[ $bindingData['portType'] ][$operation]['documentation'] : '';
+                    $this->bindings[$binding]['operations'][$operation]['documentation'] = isset($this->portTypes[$bindingData['portType']][$operation]['documentation']) ? $this->portTypes[$bindingData['portType']][$operation]['documentation'] : '';
                     $this->bindings[$binding]['operations'][$operation]['endpoint'] = isset($bindingData['endpoint']) ? $bindingData['endpoint'] : '';
                 } 
             } 
@@ -213,8 +211,8 @@ 
 	        $tr = new soap_transport_http($wsdl, $this->curl_options, $this->use_curl);
 			$tr->request_method = 'GET';
 			$tr->useSOAPAction = false;
-			if($this->proxyhost && $this->proxyport){
-				$tr->setProxy($this->proxyhost,$this->proxyport,$this->proxyusername,$this->proxypassword);
+			if ($this->proxyhost && $this->proxyport) {
+				$tr->setProxy($this->proxyhost, $this->proxyport, $this->proxyusername, $this->proxypassword);
 			}
 			if ($this->authtype != '') {
 				$tr->setCredentials($this->username, $this->password, $this->authtype, array(), $this->certRequest);
@@ -223,8 +221,8 @@ 
 			$wsdl_string = $tr->send('', $this->timeout, $this->response_timeout);
 			$this->appendDebug($tr->getDebug());
 			// catch errors
-			if($err = $tr->getError() ){
-				$errstr = 'Getting ' . $wsdl . ' - HTTP ERROR: '.$err;
+			if ($err = $tr->getError()) {
+				$errstr = 'Getting ' . $wsdl . ' - HTTP ERROR: ' . $err;
 				$this->debug($errstr);
 	            $this->setError($errstr);
 				unset($tr);
@@ -283,7 +281,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;
@@ -320,8 +318,8 @@ 
             // process attributes
             if (count($attrs) > 0) {
 				// register namespace declarations
-                foreach($attrs as $k => $v) {
-                    if (preg_match('/^xmlns/',$k)) {
+                foreach ($attrs as $k => $v) {
+                    if (preg_match('/^xmlns/', $k)) {
                         if ($ns_prefix = substr(strrchr($k, ':'), 1)) {
                             $this->namespaces[$ns_prefix] = $v;
                         } else {
@@ -334,7 +332,7 @@ 
                     }
                 }
                 // expand each attribute prefix to its namespace
-                foreach($attrs as $k => $v) {
+                foreach ($attrs as $k => $v) {
                     $k = strpos($k, ':') ? $this->expandQname($k) : $k;
                     if ($k != 'location' && $k != 'soapAction' && $k != 'namespace') {
                         $v = strpos($v, ':') ? $this->expandQname($v) : $v;
@@ -441,8 +439,8 @@ 
 					    case 'address':
 					        $this->ports[$this->currentPort]['location'] = $attrs['location'];
 					        $this->ports[$this->currentPort]['bindingType'] = $namespace;
-					        $this->bindings[ $this->ports[$this->currentPort]['binding'] ]['bindingType'] = $namespace;
-					        $this->bindings[ $this->ports[$this->currentPort]['binding'] ]['endpoint'] = $attrs['location'];
+					        $this->bindings[$this->ports[$this->currentPort]['binding']]['bindingType'] = $namespace;
+					        $this->bindings[$this->ports[$this->currentPort]['binding']]['endpoint'] = $attrs['location'];
 					        break;
 					} 
 					break;
@@ -452,13 +450,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
@@ -509,7 +507,7 @@ 
 	* @param string $name element name
 	* @access private 
 	*/
-	public function end_element($parser, $name){ 
+	public function end_element($parser, $name) { 
 		// unset schema status
 		if (/*preg_match('/types$/', $name) ||*/ preg_match('/schema$/', $name)) {
 			$this->status = "";
@@ -592,15 +590,15 @@ 
 		}
 		$this->debug("getOperations for port '$portName' bindingType $bindingType");
 		// loop thru ports
-		foreach($this->ports as $port => $portData) {
+		foreach ($this->ports as $port => $portData) {
 			$this->debug("getOperations checking port $port bindingType " . $portData['bindingType']);
 			if ($portName == '' || $port == $portName) {
 				// binding type of port matches parameter
 				if ($portData['bindingType'] == $bindingType) {
 					$this->debug("getOperations found port $port bindingType $bindingType");
 					// merge bindings
-					if (isset($this->bindings[ $portData['binding'] ]['operations'])) {
-						$ops = array_merge ($ops, $this->bindings[ $portData['binding'] ]['operations']);
+					if (isset($this->bindings[$portData['binding']]['operations'])) {
+						$ops = array_merge($ops, $this->bindings[$portData['binding']]['operations']);
 					}
 				}
 			}
@@ -627,15 +625,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;
 					} 
 				} 
@@ -658,11 +656,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;
 					} 
@@ -691,7 +689,7 @@ 
     */
 	public function getTypeDef($type, $ns) {
 		$this->debug("in getTypeDef: type=$type, ns=$ns");
-		if ((! $ns) && isset($this->namespaces['tns'])) {
+		if ((!$ns) && isset($this->namespaces['tns'])) {
 			$ns = $this->namespaces['tns'];
 			$this->debug("in getTypeDef: type namespace forced to $ns");
 		}
@@ -749,7 +747,7 @@ 
     *
     * @access private
     */
-    public function webDescription(){
+    public function webDescription() {
     	global $HTTP_SERVER_VARS;
 
 		if (isset($_SERVER)) {
@@ -761,7 +759,7 @@ 
 		}
 
 		$b = '
-		<html><head><title>NuSOAP: '.$this->serviceName.'</title>
+		<html><head><title>NuSOAP: '.$this->serviceName . '</title>
 		<style type="text/css">
 		    body    { font-family: arial; color: #000000; background-color: #ffffff; margin: 0px 0px 0px 0px; }
 		    p       { font-family: arial; color: #000000; margin-top: 0px; margin-bottom: 12px; }
@@ -838,24 +836,24 @@ 
 		<body>
 		<div class=content>
 			<br><br>
-			<div class=title>'.$this->serviceName.'</div>
+			<div class=title>'.$this->serviceName . '</div>
 			<div class=nav>
-				<p>View the <a href="'.$PHP_SELF.'?wsdl">WSDL</a> for the service.
+				<p>View the <a href="'.$PHP_SELF . '?wsdl">WSDL</a> for the service.
 				Click on an operation name to view it&apos;s details.</p>
 				<ul>';
-				foreach($this->getOperations() as $op => $data){
+				foreach ($this->getOperations() as $op => $data) {
 				    $b .= "<li><a href='#' onclick=\"popout();popup('$op')\">$op</a></li>";
 				    // create hidden div
 				    $b .= "<div id='$op' class='hidden'>
 				    <a href='#' onclick='popout()'><font color='#ffffff'>Close</font></a><br><br>";
-				    foreach($data as $donnie => $marie){ // loop through opdata
-						if($donnie == 'input' || $donnie == 'output'){ // show input/output data
-						    $b .= "<font color='white'>".ucfirst($donnie).':</font><br>';
-						    foreach($marie as $captain => $tenille){ // loop through data
-								if($captain == 'parts'){ // loop thru parts
+				    foreach ($data as $donnie => $marie) { // loop through opdata
+						if ($donnie == 'input' || $donnie == 'output') { // show input/output data
+						    $b .= "<font color='white'>" . ucfirst($donnie) . ':</font><br>';
+						    foreach ($marie as $captain => $tenille) { // loop through data
+								if ($captain == 'parts') { // loop thru parts
 								    $b .= "&nbsp;&nbsp;$captain:<br>";
 					                //if(is_array($tenille)){
-								    	foreach($tenille as $joanie => $chachi){
+								    	foreach ($tenille as $joanie => $chachi) {
 											$b .= "&nbsp;&nbsp;&nbsp;&nbsp;$joanie: $chachi<br>";
 								    	}
 					        		//}
@@ -864,7 +862,7 @@ 
 								}
 						    }
 						} else {
-						    $b .= "<font color='white'>".ucfirst($donnie).":</font> $marie<br>";
+						    $b .= "<font color='white'>" . ucfirst($donnie) . ":</font> $marie<br>";
 						}
 				    }
 					$b .= '</div>';
@@ -887,7 +885,7 @@ 
 	{
 		$xml = '<?xml version="1.0" encoding="ISO-8859-1"?>';
 		$xml .= "\n<definitions";
-		foreach($this->namespaces as $k => $v) {
+		foreach ($this->namespaces as $k => $v) {
 			$xml .= " xmlns:$k=\"$v\"";
 		} 
 		// 10.9.02 - add poulter fix for wsdl and tns declarations
@@ -900,7 +898,7 @@ 
 		$xml .= '>'; 
 		// imports
 		if (sizeof($this->import) > 0) {
-			foreach($this->import as $ns => $list) {
+			foreach ($this->import as $ns => $list) {
 				foreach ($list as $ii) {
 					if ($ii['location'] != '') {
 						$xml .= '<import location="' . $ii['location'] . '" namespace="' . $ns . '" />';
@@ -911,7 +909,7 @@ 
 			} 
 		} 
 		// types
-		if (count($this->schemas)>=1) {
+		if (count($this->schemas) >= 1) {
 			$xml .= "\n<types>\n";
 			foreach ($this->schemas as $ns => $list) {
 				foreach ($list as $xs) {
@@ -922,10 +920,10 @@ 
 		} 
 		// messages
 		if (count($this->messages) >= 1) {
-			foreach($this->messages as $msgName => $msgParts) {
+			foreach ($this->messages as $msgName => $msgParts) {
 				$xml .= "\n<message name=\"" . $msgName . '">';
-				if(is_array($msgParts)){
-					foreach($msgParts as $partName => $partType) {
+				if (is_array($msgParts)) {
+					foreach ($msgParts as $partName => $partType) {
 						// print 'serializing '.$partType.', sv: '.$this->XMLSchemaVersion.'<br>';
 						if (strpos($partType, ':')) {
 						    $typePrefix = $this->getPrefixFromNamespace($this->getPrefix($partType));
@@ -933,7 +931,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);
 						        } 
@@ -963,13 +961,13 @@ 
 		if (count($this->bindings) >= 1) {
 			$binding_xml = '';
 			$portType_xml = '';
-			foreach($this->bindings as $bindingName => $attrs) {
+			foreach ($this->bindings as $bindingName => $attrs) {
 				$binding_xml .= "\n<binding name=\"" . $bindingName . '" type="tns:' . $attrs['portType'] . '">';
 				$binding_xml .= "\n" . '  <soap:binding style="' . $attrs['style'] . '" transport="' . $attrs['transport'] . '"/>';
 				$portType_xml .= "\n<portType name=\"" . $attrs['portType'] . '">';
-				foreach($attrs['operations'] as $opName => $opParts) {
+				foreach ($attrs['operations'] as $opName => $opParts) {
 					$binding_xml .= "\n" . '  <operation name="' . $opName . '">';
-					$binding_xml .= "\n" . '    <soap:operation soapAction="' . $opParts['soapAction'] . '" style="'. $opParts['style'] . '"/>';
+					$binding_xml .= "\n" . '    <soap:operation soapAction="' . $opParts['soapAction'] . '" style="' . $opParts['style'] . '"/>';
 					if (isset($opParts['input']['encodingStyle']) && $opParts['input']['encodingStyle'] != '') {
 						$enc_style = ' encodingStyle="' . $opParts['input']['encodingStyle'] . '"';
 					} else {
@@ -988,7 +986,7 @@ 
 					    $portType_xml .= ' parameterOrder="' . $opParts['parameterOrder'] . '"';
 					} 
 					$portType_xml .= '>';
-					if(isset($opParts['documentation']) && $opParts['documentation'] != '') {
+					if (isset($opParts['documentation']) && $opParts['documentation'] != '') {
 						$portType_xml .= "\n" . '    <documentation>' . htmlspecialchars($opParts['documentation']) . '</documentation>';
 					}
 					$portType_xml .= "\n" . '    <input message="tns:' . $opParts['input']['message'] . '"/>';
@@ -1003,7 +1001,7 @@ 
 		// services
 		$xml .= "\n<service name=\"" . $this->serviceName . '">';
 		if (count($this->ports) >= 1) {
-			foreach($this->ports as $pName => $attrs) {
+			foreach ($this->ports as $pName => $attrs) {
 				$xml .= "\n" . '  <port name="' . $pName . '" binding="tns:' . $attrs['binding'] . '">';
 				$xml .= "\n" . '    <soap:address location="' . $attrs['location'] . ($debug ? '?debug=1' : '') . '"/>';
 				$xml .= "\n" . '  </port>';
@@ -1118,7 +1116,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;
 		}
@@ -1213,7 +1211,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;
 		}
@@ -1228,10 +1226,10 @@ 
 			if (is_array($parameters)) {
 				$parametersArrayType = $this->isArraySimpleOrStruct($parameters);
 				$this->debug('have ' . $parametersArrayType . ' parameters');
-				foreach($opData[$direction]['parts'] as $name => $type) {
-					$this->debug('serializing part "'.$name.'" of type "'.$type.'"');
+				foreach ($opData[$direction]['parts'] as $name => $type) {
+					$this->debug('serializing part "' . $name . '" of type "' . $type . '"');
 					// Track encoding style
-					if(isset($opData[$direction]['encodingStyle']) && $encodingStyle != $opData[$direction]['encodingStyle']) {
+					if (isset($opData[$direction]['encodingStyle']) && $encodingStyle != $opData[$direction]['encodingStyle']) {
 						$encodingStyle = $opData[$direction]['encodingStyle'];			
 						$enc_style = $encodingStyle;
 					} else {
@@ -1271,11 +1269,11 @@ 
 	 * @return string value serialized as an XML string
 	 * @access private
 	 */
-	public function serializeType($name, $type, $value, $use='encoded', $encodingStyle=false, $unqualified=false)
+	public function serializeType($name, $type, $value, $use = 'encoded', $encodingStyle = false, $unqualified = false)
 	{
 		$this->debug("in serializeType: name=$name, type=$type, use=$use, encodingStyle=$encodingStyle, unqualified=" . ($unqualified ? "unqualified" : "qualified"));
 		$this->appendDebug("value=" . $this->varDump($value));
-		if($use == 'encoded' && $encodingStyle) {
+		if ($use == 'encoded' && $encodingStyle) {
 			$encodingStyle = ' SOAP-ENV:encodingStyle="' . $encodingStyle . '"';
 		}
 
@@ -1319,7 +1317,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=\"\"";
@@ -1340,7 +1338,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';
@@ -1370,7 +1368,7 @@ 
 				$this->debug('in serializeType: appears to be Apache SOAP type');
 				if ($uqType == 'Map') {
 					$tt_prefix = $this->getPrefixFromNamespace('http://xml.apache.org/xml-soap');
-					if (! $tt_prefix) {
+					if (!$tt_prefix) {
 						$this->debug('in serializeType: Add namespace for Apache SOAP type');
 						$tt_prefix = 'ns' . rand(1000, 9999);
 						$this->namespaces[$tt_prefix] = 'http://xml.apache.org/xml-soap';
@@ -1378,11 +1376,11 @@ 
 						$tt_prefix = $this->getPrefixFromNamespace('http://xml.apache.org/xml-soap');
 					}
 					$contents = '';
-					foreach($value as $k => $v) {
+					foreach ($value as $k => $v) {
 						$this->debug("serializing map element: key $k, value $v");
 						$contents .= '<item>';
-						$contents .= $this->serialize_val($k,'key',false,false,false,false,$use);
-						$contents .= $this->serialize_val($v,'value',false,false,false,false,$use);
+						$contents .= $this->serialize_val($k, 'key', false, false, false, false, $use);
+						$contents .= $this->serialize_val($v, 'value', false, false, false, false, $use);
 						$contents .= '</item>';
 					}
 					if ($use == 'literal') {
@@ -1404,7 +1402,7 @@ 
 			$ns = '';
 			$uqType = $type;
 		}
-		if(!$typeDef = $this->getTypeDef($uqType, $ns)){
+		if (!$typeDef = $this->getTypeDef($uqType, $ns)) {
 			$this->setError("$type ($uqType) is not a supported type.");
 			$this->debug("in serializeType: $type ($uqType) is not a supported type.");
 			return false;
@@ -1421,7 +1419,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') {
@@ -1501,14 +1499,14 @@ 
 						':arrayType="' .
 						$this->getPrefixFromNamespace($this->getPrefix($typeDef['arrayType'])) .
 						':' .
-						$this->getLocalPart($typeDef['arrayType'])."[0]\"/>";
+						$this->getLocalPart($typeDef['arrayType']) . "[0]\"/>";
 				}
 				$this->debug("in serializeType: returning: $xml");
 				return $xml;
 			}
 			if (isset($typeDef['multidimensional'])) {
 				$nv = array();
-				foreach($value as $v) {
+				foreach ($value as $v) {
 					$cols = ',' . sizeof($v);
 					$nv = array_merge($nv, $v);
 				} 
@@ -1519,10 +1517,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);
@@ -1537,11 +1535,11 @@ 
 					.$contents
 					."</$name>";
 			} else {
-				$xml = "<$name$elementNS xsi:type=\"".$this->getPrefixFromNamespace('http://schemas.xmlsoap.org/soap/encoding/').':Array" '.
+				$xml = "<$name$elementNS xsi:type=\"" . $this->getPrefixFromNamespace('http://schemas.xmlsoap.org/soap/encoding/') . ':Array" ' .
 					$this->getPrefixFromNamespace('http://schemas.xmlsoap.org/soap/encoding/')
 					.':arrayType="'
 					.$this->getPrefixFromNamespace($this->getPrefix($typeDef['arrayType']))
-					.":".$this->getLocalPart($typeDef['arrayType'])."[$rows$cols]\">"
+					.":" . $this->getLocalPart($typeDef['arrayType']) . "[$rows$cols]\">"
 					.$contents
 					."</$name>";
 			}
@@ -1621,7 +1619,7 @@ 
 					$this->debug("no value provided for attribute $aName");
 				}
 				if ($xname) {
-					$xml .=  " $aName=\"" . $this->expandEntities($xvalue[$xname]) . "\"";
+					$xml .= " $aName=\"" . $this->expandEntities($xvalue[$xname]) . "\"";
 				}
 			} 
 		} else {
@@ -1642,7 +1640,7 @@ 
 	 * @return string value serialized as an XML string
 	 * @access private
 	 */
-	public function serializeComplexTypeElements($typeDef, $value, $ns, $uqType, $use='encoded', $encodingStyle=false) {
+	public function serializeComplexTypeElements($typeDef, $value, $ns, $uqType, $use = 'encoded', $encodingStyle = false) {
 		$this->debug("in serializeComplexTypeElements for XML Schema type $ns:$uqType");
 		$xml = '';
 		if (isset($typeDef['extensionBase'])) {
@@ -1669,7 +1667,7 @@ 
 				$xvalue = array();
 			}
 			// toggle whether all elements are present - ideally should validate against schema
-			if (count($typeDef['elements']) != count($xvalue)){
+			if (count($typeDef['elements']) != count($xvalue)) {
 				$optionals = true;
 			}
 			foreach ($typeDef['elements'] as $eName => $attrs) {
@@ -1682,8 +1680,8 @@ 
 				// if user took advantage of a minOccurs=0, then only serialize named parameters
 				if (isset($optionals)
 				    && (!isset($xvalue[$eName])) 
-					&& ( (!isset($attrs['nillable'])) || $attrs['nillable'] != 'true')
-					){
+					&& ((!isset($attrs['nillable'])) || $attrs['nillable'] != 'true')
+					) {
 					if (isset($attrs['minOccurs']) && $attrs['minOccurs'] <> '0') {
 						$this->debug("apparent error: no value provided for element $eName with minOccurs=" . $attrs['minOccurs']);
 					}
@@ -1748,15 +1746,15 @@ 
 	* @see nusoap_xmlschema
 	* @access public
 	*/
-	public function addComplexType($name,$typeClass='complexType',$phpType='array',$compositor='',$restrictionBase='',$elements=array(),$attrs=array(),$arrayType='') {
+	public function addComplexType($name, $typeClass = 'complexType', $phpType = 'array', $compositor = '', $restrictionBase = '', $elements = array(), $attrs = array(), $arrayType = '') {
 		if (count($elements) > 0) {
 			$eElements = array();
-	    	foreach($elements as $n => $e){
+	    	foreach ($elements as $n => $e) {
 	            // expand each element
 	            $ee = array();
 	            foreach ($e as $k => $v) {
-		            $k = strpos($k,':') ? $this->expandQname($k) : $k;
-		            $v = strpos($v,':') ? $this->expandQname($v) : $v;
+		            $k = strpos($k, ':') ? $this->expandQname($k) : $k;
+		            $v = strpos($v, ':') ? $this->expandQname($v) : $v;
 		            $ee[$k] = $v;
 		    	}
 	    		$eElements[$n] = $ee;
@@ -1765,11 +1763,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;
@@ -1777,11 +1775,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);
 	}
 
 	/**
@@ -1795,8 +1793,8 @@ 
 	* @see nusoap_xmlschema
 	* @access public
 	*/
-	public function addSimpleType($name, $restrictionBase='', $typeClass='simpleType', $phpType='scalar', $enumeration=array()) {
-		$restrictionBase = strpos($restrictionBase,':') ? $this->expandQname($restrictionBase) : $restrictionBase;
+	public function addSimpleType($name, $restrictionBase = '', $typeClass = 'simpleType', $phpType = 'scalar', $enumeration = array()) {
+		$restrictionBase = strpos($restrictionBase, ':') ? $this->expandQname($restrictionBase) : $restrictionBase;
 
 		$typens = isset($this->namespaces['types']) ? $this->namespaces['types'] : $this->namespaces['tns'];
 		$this->schemas[$typens][0]->addSimpleType($name, $restrictionBase, $typeClass, $phpType, $enumeration);
@@ -1828,7 +1826,7 @@ 
 	* @param string $encodingStyle optional (usually 'http://schemas.xmlsoap.org/soap/encoding/' for encoded)
 	* @access public 
 	*/
-	public function addOperation($name, $in = false, $out = false, $namespace = false, $soapaction = false, $style = 'rpc', $use = 'encoded', $documentation = '', $encodingStyle = ''){
+	public function addOperation($name, $in = false, $out = false, $namespace = false, $soapaction = false, $style = 'rpc', $use = 'encoded', $documentation = '', $encodingStyle = '') {
 		if ($use == 'encoded' && $encodingStyle == '') {
 			$encodingStyle = 'http://schemas.xmlsoap.org/soap/encoding/';
 		}
@@ -1852,7 +1850,7 @@ 
 		}
 
 		// get binding
-		$this->bindings[ $this->serviceName . 'Binding' ]['operations'][$name] =
+		$this->bindings[$this->serviceName . 'Binding']['operations'][$name] =
 		array(
 		'name' => $name,
 		'binding' => $this->serviceName . 'Binding',
@@ -1876,29 +1874,29 @@ 
 		'documentation' => $documentation); 
 		// add portTypes
 		// add messages
-		if($in)
+		if ($in)
 		{
-			foreach($in as $pName => $pType)
+			foreach ($in as $pName => $pType)
 			{
-				if(strpos($pType,':')) {
-					$pType = $this->getNamespaceFromPrefix($this->getPrefix($pType)).":".$this->getLocalPart($pType);
+				if (strpos($pType, ':')) {
+					$pType = $this->getNamespaceFromPrefix($this->getPrefix($pType)) . ":" . $this->getLocalPart($pType);
 				}
-				$this->messages[$name.'Request'][$pName] = $pType;
+				$this->messages[$name . 'Request'][$pName] = $pType;
 			}
 		} else {
-            $this->messages[$name.'Request']= '0';
+            $this->messages[$name . 'Request'] = '0';
         }
-		if($out)
+		if ($out)
 		{
-			foreach($out as $pName => $pType)
+			foreach ($out as $pName => $pType)
 			{
-				if(strpos($pType,':')) {
-					$pType = $this->getNamespaceFromPrefix($this->getPrefix($pType)).":".$this->getLocalPart($pType);
+				if (strpos($pType, ':')) {
+					$pType = $this->getNamespaceFromPrefix($this->getPrefix($pType)) . ":" . $this->getLocalPart($pType);
 				}
-				$this->messages[$name.'Response'][$pName] = $pType;
+				$this->messages[$name . 'Response'][$pName] = $pType;
 			}
 		} else {
-            $this->messages[$name.'Response']= '0';
+            $this->messages[$name . 'Response'] = '0';
         }
 		return true;
 	} 

libraries/nusoap/class.nusoap_base.php

Spacing +120 added lines, -120 removed lines

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

libraries/nusoap/class.xmlschema.php

Spacing +134 added lines, -134 removed lines

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

libraries/log4php.debug/appenders/LoggerAppenderMailEvent.php

Spacing +19 added lines, -19 removed lines

@@ -49,27 +49,27 @@ 
     /**
      * @var string 'from' field
      */
-    var $from           = null;
+    var $from = null;
 
     /**
      * @var integer 'from' field
      */
-    var $port           = 25;
+    var $port = 25;
 
     /**
      * @var string hostname. 
      */
-    var $smtpHost       = null;
+    var $smtpHost = null;
 
     /**
      * @var string 'subject' field
      */
-    var $subject        = '';
+    var $subject = '';
 
     /**
      * @var string 'to' field
      */
-    var $to             = null;
+    var $to = null;
     
     /**
      * @access private
@@ -99,33 +99,33 @@ 
     /**
      * @return string
      */
-    public function getFrom()      { return $this->from; }
+    public function getFrom() { return $this->from; }
     
     /**
      * @return integer
      */
-    public function getPort()      { return $this->port; }
+    public function getPort() { return $this->port; }
     
     /**
      * @return string
      */
-    public function getSmtpHost()  { return $this->smtpHost; }
+    public function getSmtpHost() { return $this->smtpHost; }
     
     /**
      * @return string
      */
-    public function getSubject()   { return $this->subject; }
+    public function getSubject() { return $this->subject; }
 
     /**
      * @return string
      */
-    public function getTo()        { return $this->to; }
+    public function getTo() { return $this->to; }
 
-    public function setFrom($from)             { $this->from = $from; }
-    public function setPort($port)             { $this->port = (int)$port; }
-    public function setSmtpHost($smtphost)     { $this->smtpHost = $smtpHost; }
-    public function setSubject($subject)       { $this->subject = $subject; }
-    public function setTo($to)                 { $this->to = $to; }
+    public function setFrom($from) { $this->from = $from; }
+    public function setPort($port) { $this->port = (int) $port; }
+    public function setSmtpHost($smtphost) { $this->smtpHost = $smtpHost; }
+    public function setSubject($subject) { $this->subject = $subject; }
+    public function setTo($to) { $this->to = $to; }
 
     public function append($event)
     {
@@ -143,7 +143,7 @@ 
         } 
 
         $smtpPort = $this->getPort();
-        $prevSmtpPort= ini_get('smtp_port');        
+        $prevSmtpPort = ini_get('smtp_port');        
         if ($smtpPort > 0 && $smtpPort < 65535) {
             ini_set('smtp_port', $smtpPort);
         } else {
@@ -155,15 +155,15 @@ 
             ":from=[{$from}]:to=[{$to}]:smtpHost=[{$smtpHost}]:smtpPort=[{$smtpPort}]"
         ); 
         
-        if (!@mail( $to, $this->getSubject(), 
+        if (!@mail($to, $this->getSubject(), 
             $this->layout->getHeader() . $this->layout->format($event) . $this->layout->getFooter($event), 
             "From: {$from}\r\n"
         )) {
             LoggerLog::debug("LoggerAppenderMailEvent::append() mail error");
         }
             
-        ini_set('SMTP',         $prevSmtpHost);
-        ini_set('smtp_port',    $prevSmtpPort);
+        ini_set('SMTP', $prevSmtpHost);
+        ini_set('smtp_port', $prevSmtpPort);
     }
 }
 

libraries/log4php.debug/appenders/LoggerAppenderDailyFile.php

Spacing +4 added lines, -4 removed lines

@@ -61,7 +61,7 @@ 
     * Sets date format for the file name.
     * @param string $format a regular date() string format
     */
-    public function setDatePattern ( $format )
+    public function setDatePattern($format)
     {
         $this->datePattern = $format;
     }
@@ -69,7 +69,7 @@ 
     /**
     * @return string returns date format for the filename
     */
-    public function getDatePattern ( )
+    public function getDatePattern( )
     {
         return $this->datePattern;
     }
@@ -86,9 +86,9 @@ 
         $args    = func_get_args();
         
         if ($numargs == 1 && is_string($args[0])) {
-            parent::setFile( sprintf((string)$args[0], date($this->getDatePattern())) );
+            parent::setFile(sprintf((string) $args[0], date($this->getDatePattern())));
         } elseif ($numargs == 2 && is_string($args[0]) && is_bool($args[1])) {
-            parent::setFile( sprintf((string)$args[0], date($this->getDatePattern())), $args[1] );
+            parent::setFile(sprintf((string) $args[0], date($this->getDatePattern())), $args[1]);
         }
     } 
 

api/mobile_services/calllistener.php

Spacing +24 added lines, -24 removed lines

@@ -8,60 +8,60 @@
  * The Initial Developer of the Original Code is YetiForce. Portions created by YetiForce are Copyright (C) www.yetiforce.com. 
  * All Rights Reserved.
  *************************************************************************************************************************************/
-class CallListener{
+class CallListener {
 	public $restler;
 	public $userID;
 	public $debug = true;
 	public $mobileKeysName = 'callListener';
 	public $permittedActions = array('addCallActions');
-    public function post($type = '', $authorization = '', $data = ''){
+    public function post($type = '', $authorization = '', $data = '') {
 		$authorization = json_decode($authorization);
 		$adb = PearDatabase::getInstance(); $log = vglobal('log');
-		$log->debug("Entering " . __CLASS__ . "::" . __METHOD__ . "| user id: ".$this->userID);
-		if( $authorization->phoneKey == '' || !$this->checkPermissions($authorization) ){
-			$resultData = Array('status' => 0,'message' =>  'No permission to: PushCall');
-		}elseif( in_array($type,$this->permittedActions) ){
+		$log->debug("Entering " . __CLASS__ . "::" . __METHOD__ . "| user id: " . $this->userID);
+		if ($authorization->phoneKey == '' || !$this->checkPermissions($authorization)) {
+			$resultData = Array('status' => 0, 'message' =>  'No permission to: PushCall');
+		}elseif (in_array($type, $this->permittedActions)) {
 			$resultData = $this->$type($data);
-		}else{
-			$resultData = Array('status' => 0,'message' =>  'Method not found: '.$type);
+		} else {
+			$resultData = Array('status' => 0, 'message' =>  'Method not found: ' . $type);
 		}
-		if($this->debug){
-			$file = 'api/mobile_services_'. __CLASS__ .'_logs.txt';
-			$test = print_r( array('respons' => $resultData, 'request' => $data ),true);
-			file_put_contents($file,'-----> '.date("Y-m-d H:i:s").' <-----'.PHP_EOL.$test.PHP_EOL,FILE_APPEND | LOCK_EX);
+		if ($this->debug) {
+			$file = 'api/mobile_services_' . __CLASS__ . '_logs.txt';
+			$test = print_r(array('respons' => $resultData, 'request' => $data), true);
+			file_put_contents($file, '-----> ' . date("Y-m-d H:i:s") . ' <-----' . PHP_EOL . $test . PHP_EOL, FILE_APPEND | LOCK_EX);
 		}
-		$log->debug("Exiting " . __CLASS__ . "::" . __METHOD__ . " | return(".print_r( $resultData,true));
+		$log->debug("Exiting " . __CLASS__ . "::" . __METHOD__ . " | return(" . print_r($resultData, true));
 		return $resultData;
     }
-	public function addCallActions($data){
+	public function addCallActions($data) {
 		$adb = PearDatabase::getInstance(); $log = vglobal('log');
-		$log->debug("Entering " . __CLASS__ . "::" . __METHOD__ . "| user id: ".$this->userID);
+		$log->debug("Entering " . __CLASS__ . "::" . __METHOD__ . "| user id: " . $this->userID);
 		$data = json_decode($data);
 		$params = array($this->userID, $data->callActions->to_number, $this->getDirection($data->callActions->direction), $this->getStatus($data->callActions->action), $data->callActions->timestamp);
-		$adb->pquery("INSERT INTO yetiforce_mobile_calllistener (`user`,`number`,`direction`,`status`,`time`) VALUES (?,?,?,?,?);",$params);
-		$log->debug("Exiting " . __CLASS__ . "::" . __METHOD__ . " | return(".print_r( $resultData,true));
+		$adb->pquery("INSERT INTO yetiforce_mobile_calllistener (`user`,`number`,`direction`,`status`,`time`) VALUES (?,?,?,?,?);", $params);
+		$log->debug("Exiting " . __CLASS__ . "::" . __METHOD__ . " | return(" . print_r($resultData, true));
 		return array('status' => 1);
 	}
-	public function checkPermissions($authorization){
+	public function checkPermissions($authorization) {
 		$adb = PearDatabase::getInstance(); $log = vglobal('log');
-		$log->debug("Entering " . __CLASS__ . "::" . __METHOD__ . "| ".print_r( $authorization,true));
+		$log->debug("Entering " . __CLASS__ . "::" . __METHOD__ . "| " . print_r($authorization, true));
 		$return = false;	
-		$result = $adb->pquery("SELECT yetiforce_mobile_keys.user FROM yetiforce_mobile_keys INNER JOIN vtiger_users ON vtiger_users.id = yetiforce_mobile_keys.user WHERE service = ? && `key` = ? && vtiger_users.user_name = ?",array($this->mobileKeysName, $authorization->phoneKey, $authorization->userName));
-		if($adb->num_rows($result) > 0 ){
+		$result = $adb->pquery("SELECT yetiforce_mobile_keys.user FROM yetiforce_mobile_keys INNER JOIN vtiger_users ON vtiger_users.id = yetiforce_mobile_keys.user WHERE service = ? && `key` = ? && vtiger_users.user_name = ?", array($this->mobileKeysName, $authorization->phoneKey, $authorization->userName));
+		if ($adb->num_rows($result) > 0) {
 			$this->userID = $adb->query_result_raw($result, 0, 'user');
 			$return = true;	
 		}
-		$log->debug("Exiting " . __CLASS__ . "::" . __METHOD__ . " | return(".$return);
+		$log->debug("Exiting " . __CLASS__ . "::" . __METHOD__ . " | return(" . $return);
 		return $return;
 	}
-	public function getDirection($type){
+	public function getDirection($type) {
 		$types = array(
 			'incoming' => 0,
 			'outgoing' => 1,
 		);
 		return $types[$type];
 	}
-	public function getStatus($type){
+	public function getStatus($type) {
 		$types = array(
 			'ringing' => 0,
 			'call' => 1,

api/mobile_services/historycall.php

Spacing +36 added lines, -36 removed lines

@@ -8,7 +8,7 @@ 
  * The Initial Developer of the Original Code is YetiForce. Portions created by YetiForce are Copyright (C) www.yetiforce.com. 
  * All Rights Reserved.
  *************************************************************************************************************************************/
-class HistoryCall{
+class HistoryCall {
     public $restler;
 	public $userID;
 	public $debug = true;
@@ -24,29 +24,29 @@ 
 		1 => 'Outgoing received',
 	);
 	
-    public function post($type = '', $authorization = '', $data = ''){
+    public function post($type = '', $authorization = '', $data = '') {
 		$authorization = json_decode($authorization);
 		$adb = PearDatabase::getInstance(); $log = vglobal('log');
 		$log->info("Start HistoryCall metod");
-		if( $authorization->phoneKey == '' || !$this->checkPermissions($authorization) ){
-			$resultData = Array('status' => 0,'message' =>  'No permission to: HistoryCall');
-		}elseif( in_array($type,$this->permittedActions) ){
+		if ($authorization->phoneKey == '' || !$this->checkPermissions($authorization)) {
+			$resultData = Array('status' => 0, 'message' =>  'No permission to: HistoryCall');
+		}elseif (in_array($type, $this->permittedActions)) {
 			$resultData = $this->$type($data);
-		}else{
-			$resultData = Array('status' => 0,'message' =>  'Method not found: '.$type);
+		} else {
+			$resultData = Array('status' => 0, 'message' =>  'Method not found: ' . $type);
 		}
-		if($this->debug){
+		if ($this->debug) {
 			$file = 'api/mobile_services_HistoryCall_logs.txt';
-			$dane = print_r( array( $type,$authorization, $data, $resultData ) ,true);
-			file_put_contents($file,'-----> '.date("Y-m-d H:i:s").' <-----'.PHP_EOL.$dane.PHP_EOL,FILE_APPEND | LOCK_EX);
+			$dane = print_r(array($type, $authorization, $data, $resultData), true);
+			file_put_contents($file, '-----> ' . date("Y-m-d H:i:s") . ' <-----' . PHP_EOL . $dane . PHP_EOL, FILE_APPEND | LOCK_EX);
 		}
         return $resultData;
     }
 	
-	public function addCallLogs($data){
+	public function addCallLogs($data) {
 		$adb = PearDatabase::getInstance(); $log = vglobal('log');
 		include_once 'include/main/WebUI.php';
-		$log->info("Start HistoryCall::addCallLogs | user id: ".$this->userID);
+		$log->info("Start HistoryCall::addCallLogs | user id: " . $this->userID);
 		$resultData = array('status' => 2);
 		$user = new Users();
 		$count = 0;
@@ -59,8 +59,8 @@ 
 			$destination = $this->findPhoneNumber($to_number);
 			
 			$CallHistory = CRMEntity::getInstance('CallHistory');
-			$CallHistory->column_fields['assigned_user_id'] =  $this->userID;
-			$CallHistory->column_fields['callhistorytype'] = $this->getType( $call->type , $call->duration);
+			$CallHistory->column_fields['assigned_user_id'] = $this->userID;
+			$CallHistory->column_fields['callhistorytype'] = $this->getType($call->type, $call->duration);
 			$CallHistory->column_fields['country'] = $call->country_iso;
 			$CallHistory->column_fields['to_number'] = $to_number;
 			$CallHistory->column_fields['from_number'] = $from_number;
@@ -73,70 +73,70 @@ 
 			$CallHistory->column_fields['ipAddress'] = $data->ipAddress;
 			$CallHistory->column_fields['simSerial'] = $data->simSerial;
 			$CallHistory->column_fields['subscriberId'] = $data->subscriberId;
-			if($destination)
+			if ($destination)
 				$CallHistory->column_fields['destination'] = $destination;
 			$CallHistory->save('CallHistory');
 			$count++;
 		}
 		$resultData = array('status' => 1, 'count' => $count);
-		$log->info("End HistoryCall::addCallLogs | return: ".print_r( $resultData,true));
+		$log->info("End HistoryCall::addCallLogs | return: " . print_r($resultData, true));
 		return $resultData;
 	}
 	
-	public function checkPermissions($authorization){
+	public function checkPermissions($authorization) {
 		$adb = PearDatabase::getInstance(); $log = vglobal('log');
-		$log->info("Start HistoryCall::checkPermissions | ".print_r( $authorization,true));
+		$log->info("Start HistoryCall::checkPermissions | " . print_r($authorization, true));
 		$return = false;	
-		$result = $adb->pquery("SELECT yetiforce_mobile_keys.user FROM yetiforce_mobile_keys INNER JOIN vtiger_users ON vtiger_users.id = yetiforce_mobile_keys.user WHERE service = ? && `key` = ? && vtiger_users.user_name = ?",array('historycall', $authorization->phoneKey, $authorization->userName),true);
-		if($adb->num_rows($result) > 0 ){
+		$result = $adb->pquery("SELECT yetiforce_mobile_keys.user FROM yetiforce_mobile_keys INNER JOIN vtiger_users ON vtiger_users.id = yetiforce_mobile_keys.user WHERE service = ? && `key` = ? && vtiger_users.user_name = ?", array('historycall', $authorization->phoneKey, $authorization->userName), true);
+		if ($adb->num_rows($result) > 0) {
 			$this->userID = $adb->query_result_raw($result, 0, 'user');
 			$return = true;	
 		}
-		$log->info("End HistoryCall::checkPermissions | return: ".$return);
+		$log->info("End HistoryCall::checkPermissions | return: " . $return);
 		return $return;
 	}
 	
-	public function findPhoneNumber($number){
+	public function findPhoneNumber($number) {
 		$adb = PearDatabase::getInstance(); $log = vglobal('log');
 		$crmid = false;
 		$modulesInstance = array();
 		$sql = "SELECT columnname,tablename,vtiger_tab.name FROM vtiger_field INNER JOIN vtiger_tab ON vtiger_tab.tabid = vtiger_field.tabid WHERE vtiger_tab.presence = 0 && uitype = '11' && vtiger_tab.name IN ('Contacts','Accounts','Leads','OSSEmployees','Vendors')";
-		$result = $adb->query($sql,true);
-		for($i = 0; $i < $adb->num_rows($result); $i++){
+		$result = $adb->query($sql, true);
+		for ($i = 0; $i < $adb->num_rows($result); $i++) {
 			$module = $adb->query_result_raw($result, $i, 'name');
 			$columnname = $adb->query_result_raw($result, $i, 'columnname');
 			$tablename = $adb->query_result_raw($result, $i, 'tablename');
-			if(!$modulesInstance[$module]){
-				include_once 'modules/'.$module.'/'.$module.'.php';
+			if (!$modulesInstance[$module]) {
+				include_once 'modules/' . $module . '/' . $module . '.php';
 				$moduleInstance = CRMEntity::getInstance($module);
 				$modulesInstance[$module] = $moduleInstance->tab_name_index;
 			}
 			$table_index = $modulesInstance[$module][$tablename];
-			if( strpos($number, '+') !== false )
+			if (strpos($number, '+') !== false)
 				$number = substr($number, 3);
-			$number = preg_replace('/\D/', '',$number);
+			$number = preg_replace('/\D/', '', $number);
 			$sqlNumber = '';
 			foreach (str_split($number) as $num) {
-				$sqlNumber .= '[^0-9]*'.$num;
+				$sqlNumber .= '[^0-9]*' . $num;
 			}
 			$sql = "SELECT crmid FROM $tablename INNER JOIN vtiger_crmentity ON vtiger_crmentity.crmid = $tablename.$table_index WHERE vtiger_crmentity.deleted = 0 && $columnname RLIKE '$sqlNumber';";
-			$resultData = $adb->query($sql,true);
-			if($adb->num_rows($resultData) > 0 ){
+			$resultData = $adb->query($sql, true);
+			if ($adb->num_rows($resultData) > 0) {
 				$crmid = $adb->query_result_raw($resultData, 0, 'crmid');
 				break;
 			}
 		}
 		return $crmid;
 	}
-	public function getType($type, $duration){
-		if($type == 2){
+	public function getType($type, $duration) {
+		if ($type == 2) {
 			return $duration > 0 ? $this->outgoingStatus[1] : $this->outgoingStatus[0];
-		}else{
-			return !$this->types[$type]? $type : $this->types[$type];
+		} else {
+			return !$this->types[$type] ? $type : $this->types[$type];
 		}
 	}
 	
-	public function getDate($timestamp){
+	public function getDate($timestamp) {
 		$timestamp = substr($timestamp, 0, 10);
 		return date("Y-m-d H:i:s", $timestamp);
 	}