YetiForceCompany / YetiForceCRM

libraries/nusoap/class.nusoap_base.php

Spacing +120 added lines, -120 removed lines

@@ -183,26 +183,26 @@ 
 	*/
 	public 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
 	*/
-	public var $xmlEntities = array('quot' => '"','amp' => '&',
-		'lt' => '<','gt' => '>','apos' => "'");
+	public 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];
 		}
@@ -890,8 +890,8 @@ 
 * @return	mixed ISO 8601 date string or false
 * @access   public
 */
-function timestamp_to_iso8601($timestamp,$utc=true){
-	$datestr = date('Y-m-d\TH:i:sO',$timestamp);
+function timestamp_to_iso8601($timestamp, $utc = true) {
+	$datestr = date('Y-m-d\TH:i:sO', $timestamp);
 	$pos = strrpos($datestr, "+");
 	if ($pos === false) {
 		$pos = strrpos($datestr, "-");
@@ -901,20 +901,20 @@ 
 			$datestr = substr($datestr, 0, $pos + 3) . ':' . substr($datestr, -2);
 		}
 	}
-	if($utc){
-		$pattern = '/'.
-		'([0-9]{4})-'.	// centuries & years CCYY-
-		'([0-9]{2})-'.	// months MM-
-		'([0-9]{2})'.	// days DD
-		'T'.			// separator T
-		'([0-9]{2}):'.	// hours hh:
-		'([0-9]{2}):'.	// minutes mm:
-		'([0-9]{2})(\.[0-9]*)?'. // seconds ss.ss...
-		'(Z|[+\-][0-9]{2}:?[0-9]{2})?'. // Z to indicate UTC, -/+HH:MM:SS.SS... for local tz's
+	if ($utc) {
+		$pattern = '/' .
+		'([0-9]{4})-' . // centuries & years CCYY-
+		'([0-9]{2})-' . // months MM-
+		'([0-9]{2})' . // days DD
+		'T' . // separator T
+		'([0-9]{2}):' . // hours hh:
+		'([0-9]{2}):' . // minutes mm:
+		'([0-9]{2})(\.[0-9]*)?' . // seconds ss.ss...
+		'(Z|[+\-][0-9]{2}:?[0-9]{2})?' . // Z to indicate UTC, -/+HH:MM:SS.SS... for local tz's
 		'/';
 
-		if(preg_match($pattern,$datestr,$regs)){
-			return sprintf('%04d-%02d-%02dT%02d:%02d:%02dZ',$regs[1],$regs[2],$regs[3],$regs[4],$regs[5],$regs[6]);
+		if (preg_match($pattern, $datestr, $regs)) {
+			return sprintf('%04d-%02d-%02dT%02d:%02d:%02dZ', $regs[1], $regs[2], $regs[3], $regs[4], $regs[5], $regs[6]);
 		}
 		return false;
 	} else {
@@ -929,27 +929,27 @@ 
 * @return	mixed Unix timestamp (int) or false
 * @access   public
 */
-function iso8601_to_timestamp($datestr){
-	$pattern = '/'.
-	'([0-9]{4})-'.	// centuries & years CCYY-
-	'([0-9]{2})-'.	// months MM-
-	'([0-9]{2})'.	// days DD
-	'T'.			// separator T
-	'([0-9]{2}):'.	// hours hh:
-	'([0-9]{2}):'.	// minutes mm:
-	'([0-9]{2})(\.[0-9]+)?'. // seconds ss.ss...
-	'(Z|[+\-][0-9]{2}:?[0-9]{2})?'. // Z to indicate UTC, -/+HH:MM:SS.SS... for local tz's
+function iso8601_to_timestamp($datestr) {
+	$pattern = '/' .
+	'([0-9]{4})-' . // centuries & years CCYY-
+	'([0-9]{2})-' . // months MM-
+	'([0-9]{2})' . // days DD
+	'T' . // separator T
+	'([0-9]{2}):' . // hours hh:
+	'([0-9]{2}):' . // minutes mm:
+	'([0-9]{2})(\.[0-9]+)?' . // seconds ss.ss...
+	'(Z|[+\-][0-9]{2}:?[0-9]{2})?' . // Z to indicate UTC, -/+HH:MM:SS.SS... for local tz's
 	'/';
-	if(preg_match($pattern,$datestr,$regs)){
+	if (preg_match($pattern, $datestr, $regs)) {
 		// not utc
-		if($regs[8] != 'Z'){
-			$op = substr($regs[8],0,1);
-			$h = substr($regs[8],1,2);
-			$m = substr($regs[8],strlen($regs[8])-2,2);
-			if($op == '-'){
+		if ($regs[8] != 'Z') {
+			$op = substr($regs[8], 0, 1);
+			$h = substr($regs[8], 1, 2);
+			$m = substr($regs[8], strlen($regs[8]) - 2, 2);
+			if ($op == '-') {
 				$regs[4] = $regs[4] + $h;
 				$regs[5] = $regs[5] + $m;
-			} elseif($op == '+'){
+			} elseif ($op == '+') {
 				$regs[4] = $regs[4] - $h;
 				$regs[5] = $regs[5] - $m;
 			}

libraries/nusoap/class.wsdl.php

Spacing +125 added lines, -127 removed lines

@@ -47,13 +47,13 @@ 
 	public var $proxypassword = '';
 	public var $timeout = 0;
 	public var $response_timeout = 30;
-	public var $curl_options = array();	// User-specified cURL options
-	public var $use_curl = false;			// whether to always try to use cURL
+	public var $curl_options = array(); // User-specified cURL options
+	public var $use_curl = false; // whether to always try to use cURL
 	// for HTTP authentication
-	public var $username = '';				// Username for HTTP authentication
-	public var $password = '';				// Password for HTTP authentication
-	public var $authtype = '';				// Type of HTTP authentication
-	public var $certRequest = array();		// Certificate for HTTP SSL authentication
+	public var $username = ''; // Username for HTTP authentication
+	public var $password = ''; // Password for HTTP authentication
+	public var $authtype = ''; // Type of HTTP authentication
+	public 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.soap_transport_http.php

Spacing +103 added lines, -103 removed lines

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

libraries/nusoap/nusoap.php

Spacing +11 added lines, -13 removed lines

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

libraries/nusoap/class.soap_parser.php

Spacing +84 added lines, -84 removed lines

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

libraries/freetag/freetag.class.php

Spacing +52 added lines, -52 removed lines

@@ -65,7 +65,7 @@ 
 	 * @access private
 	 * @param string Whether to prevent multiple vtiger_users from tagging the same object. By default, set to block (ala Upcoming.org)
 	 */
-	public var $_block_multiuser_tag_on_object =0;
+	public var $_block_multiuser_tag_on_object = 0;
 
 	/**
 	 * @access private
@@ -151,7 +151,7 @@ 
 	 * @return An array of Object ID numbers that reference your original objects.
 	 */ 
 	public function get_objects_with_tag($tag, $offset = 0, $limit = 100, $tagger_id = NULL) {
-		if(!isset($tag)) {
+		if (!isset($tag)) {
 			return false;
 		}		
 		$adb = PearDatabase::getInstance();
@@ -159,7 +159,7 @@ 
 		$where = "tag = ? ";
 		$params = array($tag);
 
-		if(isset($tagger_id) && ($tagger_id > 0)) {
+		if (isset($tagger_id) && ($tagger_id > 0)) {
 			$where .= "AND tagger_id = ? ";
 			array_push($params, $tagger_id);
 		} 
@@ -197,7 +197,7 @@ 
 	 * @return An array of Object ID numbers that reference your original objects.
 	 */ 
 	public function get_objects_with_tag_all($tag, $tagger_id = NULL) {
-		if(!isset($tag)) {
+		if (!isset($tag)) {
 			return false;
 		}		
 		$adb = PearDatabase::getInstance();
@@ -205,7 +205,7 @@ 
 		$where = "tag = ? ";
 		$params = array($tag);
 
-		if(isset($tagger_id) && ($tagger_id > 0)) {
+		if (isset($tagger_id) && ($tagger_id > 0)) {
 			$where .= "AND tagger_id = ? ";
 			array_push($params, $tagger_id);
 		} 
@@ -249,7 +249,7 @@ 
 			return $retarr;
 		}
 		$params = array($tagArray);
-		if(isset($tagger_id) && ($tagger_id > 0)) {
+		if (isset($tagger_id) && ($tagger_id > 0)) {
 			$tagger_sql = "AND tagger_id = ?";
 			array_push($params, $tagger_id);
 		} else {
@@ -270,7 +270,7 @@ 
 		$sql = "SELECT ${prefix}freetagged_objects.object_id, tag, COUNT(DISTINCT tag) AS uniques
 			FROM ${prefix}freetagged_objects 
 			INNER JOIN ${prefix}freetags ON (${prefix}freetagged_objects.tag_id = ${prefix}freetags.id)
-			WHERE ${prefix}freetags.tag IN (". generateQuestionMarks($tagArray) .")
+			WHERE ${prefix}freetags.tag IN (" . generateQuestionMarks($tagArray) . ")
 			$tagger_sql
 			GROUP BY ${prefix}freetagged_objects.object_id
 			HAVING uniques = $numTags
@@ -300,7 +300,7 @@ 
 	 * @return An array of Object ID numbers that reference your original objects.
 	 */ 
 	public function get_objects_with_tag_id($tag_id, $offset = 0, $limit = 100, $tagger_id = NULL) {
-		if(!isset($tag_id)) {
+		if (!isset($tag_id)) {
 			return false;
 		}		
 		$adb = PearDatabase::getInstance();
@@ -308,7 +308,7 @@ 
 		$where = "id = ? ";
 		$params = array($tag_id);
 		
-		if(isset($tagger_id) && ($tagger_id > 0)) {
+		if (isset($tagger_id) && ($tagger_id > 0)) {
 			$where .= "AND tagger_id = ?";
 			array_push($params, $tagger_id);
 		} 
@@ -349,19 +349,19 @@ 
 	 *	 - 'tagger_id' => The unique ID of the person who tagged the object with this tag.
 	 */ 
 	public function get_tags_on_object($object_id, $offset = 0, $limit = 10, $tagger_id = NULL) {
-		if(!isset($object_id)) {
+		if (!isset($object_id)) {
 			return false;
 		}	
 		
 		$where = "object_id = ? ";
 		$params = array($object_id);
 			
-		if(isset($tagger_id) && ($tagger_id > 0)) {
+		if (isset($tagger_id) && ($tagger_id > 0)) {
 			$where .= "AND tagger_id = ? ";
 			array_push($params, $tagger_id);
 		} 
 
-		if($limit <= 0) {
+		if ($limit <= 0) {
 			$limit_sql = "";
 		} else {
 			$limit_sql = "LIMIT $offset, $limit";
@@ -406,7 +406,7 @@ 
 	 */ 
 
 	public function safe_tag($tagger_id, $object_id, $tag, $module) {
-		if(!isset($tagger_id)||!isset($object_id)||!isset($tag)) {
+		if (!isset($tagger_id) || !isset($object_id) || !isset($tag)) {
 			die("safe_tag argument missing");
 			return false;
 		}
@@ -433,7 +433,7 @@ 
 			
 		array_push($params, $object_id, $normalized_tag);
 		$rs = $adb->pquery($sql, $params);
-		if($rs->fields['count'] > 0) {
+		if ($rs->fields['count'] > 0) {
 			return true;
 		}
 		// Then see if a raw tag in this form exists.
@@ -442,7 +442,7 @@ 
 			WHERE raw_tag = ? ";
 		$rs = $adb->pquery($sql, array($tag));
 		$row = $adb->fetch_array($rs);
-		if($row) {
+		if ($row) {
 			$tag_id = $row['id'];
 		} else {
 			// Add new tag! 
@@ -452,7 +452,7 @@ 
 			$rs = $adb->pquery($sql, $params);
 			
 		}
-		if(!($tag_id > 0)) {
+		if (!($tag_id > 0)) {
 			return false;
 		}
 		$sql = "INSERT INTO ${prefix}freetagged_objects
@@ -509,14 +509,14 @@ 
 	 * @return string Returns the tag in normalized form.
 	 */ 
 	public function delete_object_tag($tagger_id, $object_id, $tag) {
-		if(!isset($tagger_id)||!isset($object_id)||!isset($tag)) {
+		if (!isset($tagger_id) || !isset($object_id) || !isset($tag)) {
 			die("delete_object_tag argument missing");
 			return false;
 		}
 		$adb = PearDatabase::getInstance();
 		$tag_id = $this->get_raw_tag_id($tag);
 		$prefix = $this->_table_prefix;
-		if($tag_id > 0) {
+		if ($tag_id > 0) {
 
 			$sql = "DELETE FROM ${prefix}freetagged_objects
 				WHERE tagger_id = ? && object_id = ? && tag_id = ? LIMIT 1";
@@ -543,7 +543,7 @@ 
 	public function delete_all_object_tags($object_id) {
 		$adb = PearDatabase::getInstance();
 		$prefix = $this->_table_prefix;
-		if($object_id > 0) {
+		if ($object_id > 0) {
 			$sql = "DELETE FROM ${prefix}freetagged_objects
 				WHERE object_id = ? ";	
 				$rs = $adb->pquery($sql, array($object_id));	
@@ -570,13 +570,13 @@ 
 	 */ 
 
 	public function delete_all_object_tags_for_user($tagger_id, $object_id) {
-		if(!isset($tagger_id)||!isset($object_id)) {
+		if (!isset($tagger_id) || !isset($object_id)) {
 			die("delete_all_object_tags_for_user argument missing");
 			return false;
 		}
 		$adb = PearDatabase::getInstance();
 		$prefix = $this->_table_prefix;
-		if($object_id > 0) {
+		if ($object_id > 0) {
 
 			$sql = "DELETE FROM ${prefix}freetagged_objects
 				WHERE tagger_id = ? && object_id = ?";	
@@ -600,7 +600,7 @@ 
 	 * @return string Returns the tag in normalized form.
 	 */ 
 	public function get_tag_id($tag) {
-		if(!isset($tag)) {
+		if (!isset($tag)) {
 			die("get_tag_id argument missing");
 			return false;
 		}
@@ -628,7 +628,7 @@ 
 	 */ 
 
 	public function get_raw_tag_id($tag) {
-		if(!isset($tag)) {
+		if (!isset($tag)) {
 			die("get_tag_id argument missing");
 			return false;
 		}
@@ -661,7 +661,7 @@ 
 	 * @return string Returns the tag in normalized form.
 	 */
 	public function tag_object($tagger_id, $object_id, $tag_string, $module, $skip_updates = 1) {
-		if($tag_string == '') {
+		if ($tag_string == '') {
 			// If an empty string was passed, just return true, don't die.
 			// die("Empty tag string passed");
 			return true;
@@ -702,10 +702,10 @@ 
 	 * @return boolean True if successful, false otherwise.
 	 */
 	public function _tag_object_array($tagger_id, $object_id, $tagArray, $module) {
-		foreach($tagArray as $tag) {
+		foreach ($tagArray as $tag) {
 			$tag = trim($tag);
-			if(($tag != '') && (strlen($tag) <= $this->_MAX_TAG_LENGTH)) {
-				if(get_magic_quotes_gpc()) {
+			if (($tag != '') && (strlen($tag) <= $this->_MAX_TAG_LENGTH)) {
+				if (get_magic_quotes_gpc()) {
 					$tag = addslashes($tag);
 				}
 				$this->safe_tag($tagger_id, $object_id, $tag, $module);
@@ -731,12 +731,12 @@ 
 			return $newwords;
 		}
 		# Perform tag parsing
-		if(get_magic_quotes_gpc()) {
+		if (get_magic_quotes_gpc()) {
 			$query = stripslashes(trim($tag_string));
 		} else {
 			$query = trim($tag_string);
 		}
-		$words = preg_split('/(")/', $query,-1,PREG_SPLIT_NO_EMPTY|PREG_SPLIT_DELIM_CAPTURE);
+		$words = preg_split('/(")/', $query, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
 		$delim = 0;
 		foreach ($words as $key => $word)
 		{
@@ -782,7 +782,7 @@ 
 	public function get_most_popular_tags($tagger_id = NULL, $offset = 0, $limit = 25) {
 		$adb = PearDatabase::getInstance();
 		$params = array();
-		if(isset($tagger_id) && ($tagger_id > 0)) {
+		if (isset($tagger_id) && ($tagger_id > 0)) {
 			$tagger_sql = "AND tagger_id = ?";
 			array_push($params, $tagger_id);
 		} else {
@@ -826,7 +826,7 @@ 
 	public function count_tags($tagger_id = NULL) {
 		$adb = PearDatabase::getInstance();
 		$params = array();
-		if(isset($tagger_id) && ($tagger_id > 0)) {
+		if (isset($tagger_id) && ($tagger_id > 0)) {
 			$tagger_sql = "AND tagger_id = ?";
 			array_push($params, $tagger_id);
 		} else {
@@ -870,11 +870,11 @@ 
 	 * @return string Returns an HTML snippet that can be used directly as a tag cloud.
 	 */
 
-	public function get_tag_cloud_html($module="",$tagger_id = NULL,$obj_id= NULL,$num_tags = 100, $min_font_size = 10, $max_font_size = 20, $font_units = 'px', $span_class = '', $tag_page_url = '/tag/') {
+	public function get_tag_cloud_html($module = "", $tagger_id = NULL, $obj_id = NULL, $num_tags = 100, $min_font_size = 10, $max_font_size = 20, $font_units = 'px', $span_class = '', $tag_page_url = '/tag/') {
 		global $theme;
-		$theme_path="themes/".$theme."/";
-		$image_path=$theme_path."images/";	
-		$tag_list = $this->get_tag_cloud_tags($num_tags, $tagger_id,$module,$obj_id);
+		$theme_path = "themes/" . $theme . "/";
+		$image_path = $theme_path . "images/";	
+		$tag_list = $this->get_tag_cloud_tags($num_tags, $tagger_id, $module, $obj_id);
 		if (count($tag_list[0])) {
 			// Get the maximum qty of tagged objects in the set
 			$max_qty = max(array_values($tag_list[0]));
@@ -890,7 +890,7 @@ 
 		if (0 == $spread) { // Divide by zero
 			$spread = 1;
 		}
-		$step = ($max_font_size - $min_font_size)/($spread);
+		$step = ($max_font_size - $min_font_size) / ($spread);
 
 		// Since the original tag_list is alphabetically ordered,
 		// we can now create the tag cloud by just putting a span
@@ -898,18 +898,18 @@ 
 		// by $step.
 		$cloud_html = '';
 		$cloud_spans = array();
-		if($module =='')
+		if ($module == '')
 			$module = 'All';
-		if($module != 'All') {
+		if ($module != 'All') {
 			foreach ($tag_list[0] as $tag => $qty) {
 				$size = $min_font_size + ($qty - $min_qty) * $step;
-				$cloud_span[] = '<span id="tag_'.$tag_list[1][$tag].'" class="' . $span_class . '" onMouseOver=$("tagspan_'.$tag_list[1][$tag].'").style.display="inline"; onMouseOut=$("tagspan_'.$tag_list[1][$tag].'").style.display="none";><a class="tagit" href="index.php?module=Home&action=UnifiedSearch&search_module='.$module.'&search_tag=tag_search&query_string='. urlencode($tag) . '" style="font-size: '. $size . $font_units . '">' . htmlspecialchars(stripslashes($tag)) . '</a><span class="'. $span_class .'" id="tagspan_'.$tag_list[1][$tag].'" style="display:none;cursor:pointer;" onClick="DeleteTag('.$tag_list[1][$tag].','.$obj_id.');"><img src="' . vtiger_imageurl('del_tag.gif', $theme) . '"></span></span>';
+				$cloud_span[] = '<span id="tag_' . $tag_list[1][$tag] . '" class="' . $span_class . '" onMouseOver=$("tagspan_' . $tag_list[1][$tag] . '").style.display="inline"; onMouseOut=$("tagspan_' . $tag_list[1][$tag] . '").style.display="none";><a class="tagit" href="index.php?module=Home&action=UnifiedSearch&search_module=' . $module . '&search_tag=tag_search&query_string=' . urlencode($tag) . '" style="font-size: ' . $size . $font_units . '">' . htmlspecialchars(stripslashes($tag)) . '</a><span class="' . $span_class . '" id="tagspan_' . $tag_list[1][$tag] . '" style="display:none;cursor:pointer;" onClick="DeleteTag(' . $tag_list[1][$tag] . ',' . $obj_id . ');"><img src="' . vtiger_imageurl('del_tag.gif', $theme) . '"></span></span>';
 
 			}
 		} else {
-			foreach($tag_list[0] as $tag => $qty) {
+			foreach ($tag_list[0] as $tag => $qty) {
 				$size = $min_font_size + ($qty - $min_qty) * $step;
-				$cloud_span[] = '<span class="' . $span_class . '"><a class="tagit" href="index.php?module=Home&action=UnifiedSearch&search_module='.$module.'&search_tag=tag_search&query_string='. urlencode($tag) . '" style="font-size: '. $size . $font_units . '">' . htmlspecialchars(stripslashes($tag)) . '</a></span>';
+				$cloud_span[] = '<span class="' . $span_class . '"><a class="tagit" href="index.php?module=Home&action=UnifiedSearch&search_module=' . $module . '&search_tag=tag_search&query_string=' . urlencode($tag) . '" style="font-size: ' . $size . $font_units . '">' . htmlspecialchars(stripslashes($tag)) . '</a></span>';
 			}
 		}
 		$cloud_html = join("\n ", $cloud_span);
@@ -934,24 +934,24 @@ 
 	 * values are numeric quantity of objects tagged with that tag.
 	 */
 
-	public function get_tag_cloud_tags($max = 100, $tagger_id = NULL,$module = "",$obj_id = NULL) {
+	public function get_tag_cloud_tags($max = 100, $tagger_id = NULL, $module = "", $obj_id = NULL) {
 		$adb = PearDatabase::getInstance();
 		$params = array();
-		if(isset($tagger_id) && ($tagger_id > 0)) {
+		if (isset($tagger_id) && ($tagger_id > 0)) {
 			$tagger_sql = " && tagger_id = ?";
 			array_push($params, $tagger_id);
 		} else {
 			$tagger_sql = "";
 		}
 
-		if($module != "") {
+		if ($module != "") {
 			$tagger_sql .= " && module = ?";
 			array_push($params, $module);
 		} else {
 			$tagger_sql .= "";
 		}
 
-		if(isset($obj_id) && $obj_id > 0) {
+		if (isset($obj_id) && $obj_id > 0) {
   			$tagger_sql .= " && object_id = ?";
 			array_push($params, $obj_id);
 		} else {
@@ -974,10 +974,10 @@ 
 			$retarr[$row['tag']] = $row['quantity'];
 			$retarr1[$row['tag']] = $row['tag_id'];
 		}
-		if($retarr) ksort($retarr);
-		if($retarr1) ksort($retarr1);
-		$return_value[]=$retarr;
-		$return_value[]=$retarr1;
+		if ($retarr) ksort($retarr);
+		if ($retarr1) ksort($retarr1);
+		$return_value[] = $retarr;
+		$return_value[] = $retarr1;
 		return $return_value;
 
 	}
@@ -1010,7 +1010,7 @@ 
 
 	public function similar_tags($tag, $max = 100) {
 		$retarr = array();
-		if(!isset($tag)) {
+		if (!isset($tag)) {
 			return $retarr;
 		}
 		$adb = PearDatabase::getInstance();
@@ -1099,7 +1099,7 @@ 
 		$sql = "SELECT matches.object_id, COUNT( matches.object_id ) AS num_common_tags
 			FROM ${prefix}freetagged_objects as matches
 			INNER JOIN ${prefix}freetags as tags ON ( tags.id = matches.tag_id )
-			WHERE tags.tag IN (". generateQuestionMarks($tagArray) .")
+			WHERE tags.tag IN (" . generateQuestionMarks($tagArray) . ")
 			GROUP BY matches.object_id
 			HAVING num_common_tags >= ?
 			ORDER BY num_common_tags DESC
@@ -1107,7 +1107,7 @@ 
 
 		$rs = $adb->pquery($sql, array($tagArray, $threshold, $max_objects));
 		while ($row = $adb->fetch_array($rs)) {
-			$retarr[] = array (
+			$retarr[] = array(
 				'object_id' => $row['object_id'],
 				'strength' => ($row['num_common_tags'] / $numTags)
 				);

vtlib/thirdparty/dUnzip2.inc.php

Spacing +11 added lines, -18 removed lines

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