chamilo / chamilo-lms

main/inc/lib/phpdocx/lib/log4php/layouts/LoggerLayoutTTCC.php

Spacing +8 added lines, -10 removed lines

@@ -94,8 +94,7 @@ 
      */
     public function setThreadPrinting($threadPrinting) {
         $this->threadPrinting = is_bool($threadPrinting) ? 
-            $threadPrinting : 
-            (bool)(strtolower($threadPrinting) == 'true'); 
+            $threadPrinting : (bool) (strtolower($threadPrinting) == 'true'); 
     }
 
     /**
@@ -143,8 +142,7 @@ 
      */
     public function setMicroSecondsPrinting($microSecondsPrinting) {
         $this->microSecondsPrinting = is_bool($microSecondsPrinting) ? 
-            $microSecondsPrinting : 
-            (bool)(strtolower($microSecondsPrinting) == 'true'); 
+            $microSecondsPrinting : (bool) (strtolower($microSecondsPrinting) == 'true'); 
     }
 
     /**
@@ -175,11 +173,11 @@ 
      * @return string
      */
     public function format(LoggerLoggingEvent $event) {
-        $timeStamp = (float)$event->getTimeStamp();
-        $format = strftime($this->dateFormat, (int)$timeStamp);
+        $timeStamp = (float) $event->getTimeStamp();
+        $format = strftime($this->dateFormat, (int) $timeStamp);
         
         if ($this->microSecondsPrinting) {
-            $usecs = floor(($timeStamp - (int)$timeStamp) * 1000);
+            $usecs = floor(($timeStamp - (int) $timeStamp) * 1000);
             $format .= sprintf(',%03d', $usecs);
         }
             
@@ -192,13 +190,13 @@ 
         $level = $event->getLevel();
         $format .= $level->toString().' ';
         
-        if($this->categoryPrefixing) {
+        if ($this->categoryPrefixing) {
             $format .= $event->getLoggerName().' ';
         }
        
-        if($this->contextPrinting) {
+        if ($this->contextPrinting) {
             $ndc = $event->getNDC();
-            if($ndc != null) {
+            if ($ndc != null) {
                 $format .= $ndc.' ';
             }
         }

main/inc/lib/phpdocx/lib/log4php/layouts/LoggerLayoutPattern.php

Spacing +1 added lines, -1 removed lines

@@ -206,7 +206,7 @@
         $results = array();
         $c = $this->head;
         while ($c !== null) {
-            if ( ! $c instanceOf LoggerLiteralPatternConverter) {
+            if (!$c instanceOf LoggerLiteralPatternConverter) {
                 $sbuf = null;
                 $c->format($sbuf, $event);
                 $results[] = $sbuf;

main/inc/lib/phpdocx/lib/log4php/layouts/LoggerLayoutSimple.php

Spacing +1 added lines, -1 removed lines

@@ -56,6 +56,6 @@
      */
     public function format(LoggerLoggingEvent $event) {
         $level = $event->getLevel();
-        return $level->toString() . ' - ' . $event->getRenderedMessage(). PHP_EOL;
+        return $level->toString().' - '.$event->getRenderedMessage().PHP_EOL;
     }
 }

main/inc/lib/security.lib.php

Spacing +3 added lines, -3 removed lines

@@ -91,7 +91,7 @@ 
             $rel_path = '/'.$rel_path;
         }
         $abs_path = $current_path.$rel_path;
-        $true_path=str_replace("\\", '/', realpath($abs_path));
+        $true_path = str_replace("\\", '/', realpath($abs_path));
         $found = strpos($true_path.'/', $checker_path);
         if ($found === 0) {
             return true;
@@ -321,7 +321,7 @@ 
         }
 
         if ($user_status == COURSEMANAGERLOWSECURITY) {
-            return $var;  // No filtering.
+            return $var; // No filtering.
         }
 
         static $purifier = array();
@@ -344,7 +344,7 @@ 
             }
 
             // Shows _target attribute in anchors
-            $config->set('Attr.AllowedFrameTargets', array('_blank','_top','_self', '_parent'));
+            $config->set('Attr.AllowedFrameTargets', array('_blank', '_top', '_self', '_parent'));
 
             if ($user_status == STUDENT) {
                 global $allowed_html_student;

main/inc/lib/wami-recorder/record_document.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
 // Do not use here check Fileinfo method because return: text/plain
 
 $dirBaseDocuments = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
-$saveDir = $dirBaseDocuments . $wamidir;
+$saveDir = $dirBaseDocuments.$wamidir;
 
 if (!is_dir($saveDir)) {
     DocumentManager::createDefaultAudioFolder($_course);

main/inc/lib/course_home.lib.php

Spacing +4 added lines, -4 removed lines

@@ -351,7 +351,7 @@ 
                         array(),
                         null,
                         ICON_SIZE_MEDIUM
-                    ) . '&nbsp;' . $tool_name . '</a>';
+                    ).'&nbsp;'.$tool_name.'</a>';
 
                 // This part displays the links to hide or remove a tool.
                 // These links are only visible by the course manager.
@@ -678,7 +678,7 @@ 
         $session_id = api_get_session_id();
         $is_platform_admin = api_is_platform_admin();
 
-        if ($session_id == 0 ) {
+        if ($session_id == 0) {
             $is_allowed_to_edit = api_is_allowed_to_edit(null, true) && api_is_course_admin();
         } else {
             $is_allowed_to_edit = api_is_allowed_to_edit(null, true) && !api_is_coach();
@@ -1255,7 +1255,7 @@ 
             return array();
         }
 
-        $table  = Database::get_course_table(TABLE_TOOL_LIST);
+        $table = Database::get_course_table(TABLE_TOOL_LIST);
         $sql = "SELECT * FROM $table
                 WHERE category in ('authoring','interaction')
                 AND c_id = $courseId
@@ -1361,7 +1361,7 @@ 
             $temp = new Image($path);
             $r = $temp->convert2bw();
             $ext = pathinfo($path, PATHINFO_EXTENSION);
-            $bwPath = substr($path,0,-(strlen($ext)+1)) . '_na.' . $ext;
+            $bwPath = substr($path, 0, -(strlen($ext) + 1)).'_na.'.$ext;
 
             if ($r === false) {
                 error_log('Conversion to B&W of '.$path.' failed in '.__FILE__.' at line '.__LINE__);

main/inc/lib/access_url_edit_users_to_url_functions.lib.php

Spacing +4 added lines, -4 removed lines

@@ -43,22 +43,22 @@
                    ' WHERE (username LIKE "'.$needle.'%" '.
                    ' OR firstname LIKE "'.$needle.'%" '.
                    ' OR lastname LIKE "'.$needle.'%") '.
-                    $order_clause .
+                    $order_clause.
                    ' LIMIT 11';
 
             $rs = Database::query($sql);
-            $i=0;
+            $i = 0;
 
             while ($user = Database :: fetch_array($rs)) {
                 $i++;
-                if ($i<=10) {
+                if ($i <= 10) {
                     $return .= '<a href="javascript: void(0);" onclick="javascript: add_user_to_url(\''.addslashes($user['user_id']).'\',\''.api_get_person_name(addslashes($user['firstname']), addslashes($user['lastname'])).' ('.addslashes($user['username']).')'.'\')">'.api_get_person_name($user['firstname'], $user['lastname']).' ('.$user['username'].')</a><br />';
                 } else {
                     $return .= '...<br />';
                 }
             }
         }
-        $xajax_response -> addAssign('ajax_list_users','innerHTML',api_utf8_encode($return));
+        $xajax_response -> addAssign('ajax_list_users', 'innerHTML', api_utf8_encode($return));
         return $xajax_response;
     }
 }

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

Spacing +139 added lines, -139 removed lines

@@ -12,7 +12,7 @@ 
 * @version  $Id: class.xmlschema.php,v 1.53 2010/04/26 20:15:08 snichol Exp $

 * @access   public

 */

-class nusoap_xmlschema extends nusoap_base  {

+class nusoap_xmlschema extends nusoap_base {

 	

 	// files

 	var $schema = '';

@@ -51,7 +51,7 @@ 
 	* @param	string $namespaces namespaces defined in enclosing XML

 	* @access   public

 	*/

-	function nusoap_xmlschema($schema='',$xml='',$namespaces=array()){

+	function nusoap_xmlschema($schema = '', $xml = '', $namespaces = array()) {

 		parent::nusoap_base();

 		$this->debug('nusoap_xmlschema class instantiated, inside constructor');

 		// files

@@ -63,13 +63,13 @@ 
 		$this->namespaces = array_merge($this->namespaces, $namespaces);

 

 		// parse schema file

-		if($schema != ''){

+		if ($schema != '') {

 			$this->debug('initial schema file: '.$schema);

 			$this->parseFile($schema, 'schema');

 		}

 

 		// parse xml file

-		if($xml != ''){

+		if ($xml != '') {

 			$this->debug('initial xml file: '.$xml);

 			$this->parseFile($xml, 'xml');

 		}

@@ -84,18 +84,18 @@ 
 	* @return boolean

     * @access public

     */

-	function parseFile($xml,$type){

+	function parseFile($xml, $type) {

 		// parse xml file

-		if($xml != ""){

-			$xmlStr = @join("",@file($xml));

-			if($xmlStr == ""){

+		if ($xml != "") {

+			$xmlStr = @join("", @file($xml));

+			if ($xmlStr == "") {

 				$msg = 'Error reading XML from '.$xml;

 				$this->setError($msg);

 				$this->debug($msg);

 			return false;

 			} else {

 				$this->debug("parsing $xml");

-				$this->parseString($xmlStr,$type);

+				$this->parseString($xmlStr, $type);

 				$this->debug("done parsing $xml");

 			return true;

 			}

@@ -110,9 +110,9 @@ 
     * @param	string $type (schema|xml)

 	* @access   private

 	*/

-	function parseString($xml,$type){

+	function parseString($xml, $type) {

 		// parse xml string

-		if($xml != ""){

+		if ($xml != "") {

 

 	    	// Create an XML parser.

 	    	$this->parser = xml_parser_create();

@@ -123,28 +123,28 @@ 
 	    	xml_set_object($this->parser, $this);

 

 	    	// Set the element handlers for the parser.

-			if($type == "schema"){

-		    	xml_set_element_handler($this->parser, 'schemaStartElement','schemaEndElement');

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

-			} elseif($type == "xml"){

-				xml_set_element_handler($this->parser, 'xmlStartElement','xmlEndElement');

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

+			if ($type == "schema") {

+		    	xml_set_element_handler($this->parser, 'schemaStartElement', 'schemaEndElement');

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

+			} elseif ($type == "xml") {

+				xml_set_element_handler($this->parser, 'xmlStartElement', 'xmlEndElement');

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

 			}

 

 		    // Parse the XML file.

-		    if(!xml_parse($this->parser,$xml,true)){

+		    if (!xml_parse($this->parser, $xml, true)) {

 			// Display an error message.

 				$errstr = sprintf('XML error parsing XML schema on line %d: %s',

 				xml_get_current_line_number($this->parser),

 				xml_error_string(xml_get_error_code($this->parser))

 				);

 				$this->debug($errstr);

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

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

 				$this->setError($errstr);

 	    	}

             

 			xml_parser_free($this->parser);

-		} else{

+		} else {

 			$this->debug('no xml passed to parseString()!!');

 			$this->setError('no xml passed to parseString()!!');

 		}

@@ -160,9 +160,9 @@ 
 	function CreateTypeName($ename) {

 		$scope = '';

 		for ($i = 0; $i < count($this->complexTypeStack); $i++) {

-			$scope .= $this->complexTypeStack[$i] . '_';

+			$scope .= $this->complexTypeStack[$i].'_';

 		}

-		return $scope . $ename . '_ContainedType';

+		return $scope.$ename.'_ContainedType';

 	}

 	

 	/**

@@ -188,7 +188,7 @@ 
 		}

 

 		// get element prefix

-		if($prefix = $this->getPrefix($name)){

+		if ($prefix = $this->getPrefix($name)) {

 			// get unqualified name

 			$name = $this->getLocalPart($name);

 		} else {

@@ -196,31 +196,31 @@ 
         }

 		

         // loop thru attributes, expanding, and registering namespace declarations

-        if(count($attrs) > 0){

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

+        if (count($attrs) > 0) {

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

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

-				if(preg_match('/^xmlns/',$k)){

+				if (preg_match('/^xmlns/', $k)) {

                 	//$this->xdebug("$k: $v");

                 	//$this->xdebug('ns_prefix: '.$this->getPrefix($k));

-                	if($ns_prefix = substr(strrchr($k,':'),1)){

+                	if ($ns_prefix = substr(strrchr($k, ':'), 1)) {

                 		//$this->xdebug("Add namespace[$ns_prefix] = $v");

 						$this->namespaces[$ns_prefix] = $v;

 					} else {

 						$this->defaultNamespace[$pos] = $v;

-						if (! $this->getPrefixFromNamespace($v)) {

-							$this->namespaces['ns'.(count($this->namespaces)+1)] = $v;

+						if (!$this->getPrefixFromNamespace($v)) {

+							$this->namespaces['ns'.(count($this->namespaces) + 1)] = $v;

 						}

 					}

-					if($v == 'http://www.w3.org/2001/XMLSchema' || $v == 'http://www.w3.org/1999/XMLSchema' || $v == 'http://www.w3.org/2000/10/XMLSchema'){

+					if ($v == 'http://www.w3.org/2001/XMLSchema' || $v == 'http://www.w3.org/1999/XMLSchema' || $v == 'http://www.w3.org/2000/10/XMLSchema') {

 						$this->XMLSchemaVersion = $v;

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

 					}

 				}

         	}

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

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

                 // expand each attribute

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

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

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

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

         		$eAttrs[$k] = $v;

         	}

         	$attrs = $eAttrs;

@@ -228,7 +228,7 @@ 
         	$attrs = array();

         }

 		// find status, register data

-		switch($name){

+		switch ($name) {

 			case 'all':			// (optional) compositor content for a complexType

 			case 'choice':

 			case 'group':

@@ -253,41 +253,41 @@ 
 						// no namespace in arrayType attribute value...

 						if ($this->defaultNamespace[$pos]) {

 							// ...so use the default

-							$attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'] = $this->defaultNamespace[$pos] . ':' . $attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'];

+							$attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'] = $this->defaultNamespace[$pos].':'.$attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'];

 						}

 					}

             	}

-                if(isset($attrs['name'])){

+                if (isset($attrs['name'])) {

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

 					$aname = $attrs['name'];

-				} elseif(isset($attrs['ref']) && $attrs['ref'] == 'http://schemas.xmlsoap.org/soap/encoding/:arrayType'){

+				} elseif (isset($attrs['ref']) && $attrs['ref'] == 'http://schemas.xmlsoap.org/soap/encoding/:arrayType') {

 					if (isset($attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'])) {

 	                	$aname = $attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'];

 	                } else {

 	                	$aname = '';

 	                }

-				} elseif(isset($attrs['ref'])){

+				} elseif (isset($attrs['ref'])) {

 					$aname = $attrs['ref'];

                     $this->attributes[$attrs['ref']] = $attrs;

 				}

                 

-				if($this->currentComplexType){	// This should *always* be

+				if ($this->currentComplexType) {	// This should *always* be

 					$this->complexTypes[$this->currentComplexType]['attrs'][$aname] = $attrs;

 				}

 				// arrayType attribute

-				if(isset($attrs['http://schemas.xmlsoap.org/wsdl/:arrayType']) || $this->getLocalPart($aname) == 'arrayType'){

+				if (isset($attrs['http://schemas.xmlsoap.org/wsdl/:arrayType']) || $this->getLocalPart($aname) == 'arrayType') {

 					$this->complexTypes[$this->currentComplexType]['phpType'] = 'array';

                 	$prefix = $this->getPrefix($aname);

-					if(isset($attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'])){

+					if (isset($attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'])) {

 						$v = $attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'];

 					} else {

 						$v = '';

 					}

-                    if(strpos($v,'[,]')){

+                    if (strpos($v, '[,]')) {

                         $this->complexTypes[$this->currentComplexType]['multidimensional'] = true;

                     }

-                    $v = substr($v,0,strpos($v,'[')); // clip the []

-                    if(!strpos($v,':') && isset($this->typemap[$this->XMLSchemaVersion][$v])){

+                    $v = substr($v, 0, strpos($v, '[')); // clip the []

+                    if (!strpos($v, ':') && isset($this->typemap[$this->XMLSchemaVersion][$v])) {

                         $v = $this->XMLSchemaVersion.':'.$v;

                     }

                     $this->complexTypes[$this->currentComplexType]['arrayType'] = $v;

@@ -298,7 +298,7 @@ 
 			break;

 			case 'complexType':

 				array_push($this->complexTypeStack, $this->currentComplexType);

-				if(isset($attrs['name'])){

+				if (isset($attrs['name'])) {

 					// TODO: what is the scope of named complexTypes that appear

 					//       nested within other c complexTypes?

 					$this->xdebug('processing named complexType '.$attrs['name']);

@@ -313,7 +313,7 @@ 
 					//                        minOccurs="0" maxOccurs="unbounded" />

 					//                </sequence>

 					//            </complexType>

-					if(isset($attrs['base']) && preg_match('/:Array$/',$attrs['base'])){

+					if (isset($attrs['base']) && preg_match('/:Array$/', $attrs['base'])) {

 						$this->xdebug('complexType is unusual array');

 						$this->complexTypes[$this->currentComplexType]['phpType'] = 'array';

 					} else {

@@ -321,7 +321,7 @@ 
 					}

 				} else {

 					$name = $this->CreateTypeName($this->currentElement);

-					$this->xdebug('processing unnamed complexType for element ' . $this->currentElement . ' named ' . $name);

+					$this->xdebug('processing unnamed complexType for element '.$this->currentElement.' named '.$name);

 					$this->currentComplexType = $name;

 					//$this->currentElement = false;

 					$this->complexTypes[$this->currentComplexType] = $attrs;

@@ -333,7 +333,7 @@ 
 					//                        minOccurs="0" maxOccurs="unbounded" />

 					//                </sequence>

 					//            </complexType>

-					if(isset($attrs['base']) && preg_match('/:Array$/',$attrs['base'])){

+					if (isset($attrs['base']) && preg_match('/:Array$/', $attrs['base'])) {

 						$this->xdebug('complexType is unusual array');

 						$this->complexTypes[$this->currentComplexType]['phpType'] = 'array';

 					} else {

@@ -352,12 +352,12 @@ 
 						$attrs['form'] = 'qualified';

 					}

 				}

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

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

 					$this->xdebug("processing typed element ".$attrs['name']." of type ".$attrs['type']);

-					if (! $this->getPrefix($attrs['type'])) {

+					if (!$this->getPrefix($attrs['type'])) {

 						if ($this->defaultNamespace[$pos]) {

-							$attrs['type'] = $this->defaultNamespace[$pos] . ':' . $attrs['type'];

-							$this->xdebug('used default namespace to make type ' . $attrs['type']);

+							$attrs['type'] = $this->defaultNamespace[$pos].':'.$attrs['type'];

+							$this->xdebug('used default namespace to make type '.$attrs['type']);

 						}

 					}

 					// This is for constructs like

@@ -368,20 +368,20 @@ 
 					//                </sequence>

 					//            </complexType>

 					if ($this->currentComplexType && $this->complexTypes[$this->currentComplexType]['phpType'] == 'array') {

-						$this->xdebug('arrayType for unusual array is ' . $attrs['type']);

+						$this->xdebug('arrayType for unusual array is '.$attrs['type']);

 						$this->complexTypes[$this->currentComplexType]['arrayType'] = $attrs['type'];

 					}

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

 					$ename = $attrs['name'];

-				} elseif(isset($attrs['ref'])){

+				} elseif (isset($attrs['ref'])) {

 					$this->xdebug("processing element as ref to ".$attrs['ref']);

 					$this->currentElement = "ref to ".$attrs['ref'];

 					$ename = $this->getLocalPart($attrs['ref']);

 				} else {

-					$type = $this->CreateTypeName($this->currentComplexType . '_' . $attrs['name']);

-					$this->xdebug("processing untyped element " . $attrs['name'] . ' type ' . $type);

+					$type = $this->CreateTypeName($this->currentComplexType.'_'.$attrs['name']);

+					$this->xdebug("processing untyped element ".$attrs['name'].' type '.$type);

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

-					$attrs['type'] = $this->schemaTargetNamespace . ':' . $type;

+					$attrs['type'] = $this->schemaTargetNamespace.':'.$type;

 					$ename = $attrs['name'];

 				}

 				if (isset($ename) && $this->currentComplexType) {

@@ -389,12 +389,12 @@ 
 					$this->complexTypes[$this->currentComplexType]['elements'][$ename] = $attrs;

 				} elseif (!isset($attrs['ref'])) {

 					$this->xdebug("add element $ename to elements array");

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

-					$this->elements[ $attrs['name'] ]['typeClass'] = 'element';

+					$this->elements[$attrs['name']] = $attrs;

+					$this->elements[$attrs['name']]['typeClass'] = 'element';

 				}

 			break;

 			case 'enumeration':	//	restriction value list member

-				$this->xdebug('enumeration ' . $attrs['value']);

+				$this->xdebug('enumeration '.$attrs['value']);

 				if ($this->currentSimpleType) {

 					$this->simpleTypes[$this->currentSimpleType]['enumeration'][] = $attrs['value'];

 				} elseif ($this->currentComplexType) {

@@ -402,11 +402,11 @@ 
 				}

 			break;

 			case 'extension':	// simpleContent or complexContent type extension

-				$this->xdebug('extension ' . $attrs['base']);

+				$this->xdebug('extension '.$attrs['base']);

 				if ($this->currentComplexType) {

 					$ns = $this->getPrefix($attrs['base']);

 					if ($ns == '') {

-						$this->complexTypes[$this->currentComplexType]['extensionBase'] = $this->schemaTargetNamespace . ':' . $attrs['base'];

+						$this->complexTypes[$this->currentComplexType]['extensionBase'] = $this->schemaTargetNamespace.':'.$attrs['base'];

 					} else {

 						$this->complexTypes[$this->currentComplexType]['extensionBase'] = $attrs['base'];

 					}

@@ -416,19 +416,19 @@ 
 			break;

 			case 'import':

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

-					$this->xdebug('import namespace ' . $attrs['namespace'] . ' from ' . $attrs['schemaLocation']);

+					$this->xdebug('import namespace '.$attrs['namespace'].' from '.$attrs['schemaLocation']);

                     $this->imports[$attrs['namespace']][] = array('location' => $attrs['schemaLocation'], 'loaded' => false);

 				} else {

-					$this->xdebug('import namespace ' . $attrs['namespace']);

+					$this->xdebug('import namespace '.$attrs['namespace']);

                     $this->imports[$attrs['namespace']][] = array('location' => '', 'loaded' => true);

-					if (! $this->getPrefixFromNamespace($attrs['namespace'])) {

-						$this->namespaces['ns'.(count($this->namespaces)+1)] = $attrs['namespace'];

+					if (!$this->getPrefixFromNamespace($attrs['namespace'])) {

+						$this->namespaces['ns'.(count($this->namespaces) + 1)] = $attrs['namespace'];

 					}

 				}

 			break;

 			case 'include':

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

-					$this->xdebug('include into namespace ' . $this->schemaTargetNamespace . ' from ' . $attrs['schemaLocation']);

+					$this->xdebug('include into namespace '.$this->schemaTargetNamespace.' from '.$attrs['schemaLocation']);

                     $this->imports[$this->schemaTargetNamespace][] = array('location' => $attrs['schemaLocation'], 'loaded' => false);

 				} else {

 					$this->xdebug('ignoring invalid XML Schema construct: include without schemaLocation attribute');

@@ -438,12 +438,12 @@ 
 				$this->xdebug("do nothing for element $name");

 			break;

 			case 'restriction':	// simpleType, simpleContent or complexContent value restriction

-				$this->xdebug('restriction ' . $attrs['base']);

-				if($this->currentSimpleType){

+				$this->xdebug('restriction '.$attrs['base']);

+				if ($this->currentSimpleType) {

 					$this->simpleTypes[$this->currentSimpleType]['type'] = $attrs['base'];

-				} elseif($this->currentComplexType){

+				} elseif ($this->currentComplexType) {

 					$this->complexTypes[$this->currentComplexType]['restrictionBase'] = $attrs['base'];

-					if(strstr($attrs['base'],':') == ':Array'){

+					if (strstr($attrs['base'], ':') == ':Array') {

 						$this->complexTypes[$this->currentComplexType]['phpType'] = 'array';

 					}

 				}

@@ -470,15 +470,15 @@ 
 			break;

 			case 'simpleType':

 				array_push($this->simpleTypeStack, $this->currentSimpleType);

-				if(isset($attrs['name'])){

-					$this->xdebug("processing simpleType for name " . $attrs['name']);

+				if (isset($attrs['name'])) {

+					$this->xdebug("processing simpleType for name ".$attrs['name']);

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

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

-					$this->simpleTypes[ $attrs['name'] ]['typeClass'] = 'simpleType';

-					$this->simpleTypes[ $attrs['name'] ]['phpType'] = 'scalar';

+					$this->simpleTypes[$attrs['name']] = $attrs;

+					$this->simpleTypes[$attrs['name']]['typeClass'] = 'simpleType';

+					$this->simpleTypes[$attrs['name']]['phpType'] = 'scalar';

 				} else {

-					$name = $this->CreateTypeName($this->currentComplexType . '_' . $this->currentElement);

-					$this->xdebug('processing unnamed simpleType for element ' . $this->currentElement . ' named ' . $name);

+					$name = $this->CreateTypeName($this->currentComplexType.'_'.$this->currentElement);

+					$this->xdebug('processing unnamed simpleType for element '.$this->currentElement.' named '.$name);

 					$this->currentSimpleType = $name;

 					//$this->currentElement = false;

 					$this->simpleTypes[$this->currentSimpleType] = $attrs;

@@ -504,29 +504,29 @@ 
 		// bring depth down a notch

 		$this->depth--;

 		// position of current element is equal to the last value left in depth_array for my depth

-		if(isset($this->depth_array[$this->depth])){

+		if (isset($this->depth_array[$this->depth])) {

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

         }

 		// get element prefix

-		if ($prefix = $this->getPrefix($name)){

+		if ($prefix = $this->getPrefix($name)) {

 			// get unqualified name

 			$name = $this->getLocalPart($name);

 		} else {

         	$prefix = '';

         }

 		// move on...

-		if($name == 'complexType'){

-			$this->xdebug('done processing complexType ' . ($this->currentComplexType ? $this->currentComplexType : '(unknown)'));

+		if ($name == 'complexType') {

+			$this->xdebug('done processing complexType '.($this->currentComplexType ? $this->currentComplexType : '(unknown)'));

 			$this->xdebug($this->varDump($this->complexTypes[$this->currentComplexType]));

 			$this->currentComplexType = array_pop($this->complexTypeStack);

 			//$this->currentElement = false;

 		}

-		if($name == 'element'){

-			$this->xdebug('done processing element ' . ($this->currentElement ? $this->currentElement : '(unknown)'));

+		if ($name == 'element') {

+			$this->xdebug('done processing element '.($this->currentElement ? $this->currentElement : '(unknown)'));

 			$this->currentElement = array_pop($this->elementStack);

 		}

-		if($name == 'simpleType'){

-			$this->xdebug('done processing simpleType ' . ($this->currentSimpleType ? $this->currentSimpleType : '(unknown)'));

+		if ($name == 'simpleType') {

+			$this->xdebug('done processing simpleType '.($this->currentSimpleType ? $this->currentSimpleType : '(unknown)'));

 			$this->xdebug($this->varDump($this->simpleTypes[$this->currentSimpleType]));

 			$this->currentSimpleType = array_pop($this->simpleTypeStack);

 		}

@@ -539,7 +539,7 @@ 
 	* @param    string $data element content

 	* @access   private

 	*/

-	function schemaCharacterData($parser, $data){

+	function schemaCharacterData($parser, $data) {

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

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

 	}

@@ -549,32 +549,32 @@ 
 	*

 	* @access   public

 	*/

-	function serializeSchema(){

+	function serializeSchema() {

 

 		$schemaPrefix = $this->getPrefixFromNamespace($this->XMLSchemaVersion);

 		$xml = '';

 		// imports

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

-			foreach($this->imports as $ns => $list) {

+			foreach ($this->imports as $ns => $list) {

 				foreach ($list as $ii) {

 					if ($ii['location'] != '') {

-						$xml .= " <$schemaPrefix:import location=\"" . $ii['location'] . '" namespace="' . $ns . "\" />\n";

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

 					} else {

-						$xml .= " <$schemaPrefix:import namespace=\"" . $ns . "\" />\n";

+						$xml .= " <$schemaPrefix:import namespace=\"".$ns."\" />\n";

 					}

 				}

 			} 

 		} 

 		// complex types

-		foreach($this->complexTypes as $typeName => $attrs){

+		foreach ($this->complexTypes as $typeName => $attrs) {

 			$contentStr = '';

 			// serialize child elements

-			if(isset($attrs['elements']) && (count($attrs['elements']) > 0)){

-				foreach($attrs['elements'] as $element => $eParts){

-					if(isset($eParts['ref'])){

+			if (isset($attrs['elements']) && (count($attrs['elements']) > 0)) {

+				foreach ($attrs['elements'] as $element => $eParts) {

+					if (isset($eParts['ref'])) {

 						$contentStr .= "   <$schemaPrefix:element ref=\"$element\"/>\n";

 					} else {

-						$contentStr .= "   <$schemaPrefix:element name=\"$element\" type=\"" . $this->contractQName($eParts['type']) . "\"";

+						$contentStr .= "   <$schemaPrefix:element name=\"$element\" type=\"".$this->contractQName($eParts['type'])."\"";

 						foreach ($eParts as $aName => $aValue) {

 							// handle, e.g., abstract, default, form, minOccurs, maxOccurs, nillable

 							if ($aName != 'name' && $aName != 'type') {

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

 			}

 			// attributes

-			if(isset($attrs['attrs']) && (count($attrs['attrs']) >= 1)){

-				foreach($attrs['attrs'] as $attr => $aParts){

+			if (isset($attrs['attrs']) && (count($attrs['attrs']) >= 1)) {

+				foreach ($attrs['attrs'] as $attr => $aParts) {

 					$contentStr .= "    <$schemaPrefix:attribute";

 					foreach ($aParts as $a => $v) {

 						if ($a == 'ref' || $a == 'type') {

@@ -607,15 +607,15 @@ 
 				}

 			}

 			// if restriction

-			if (isset($attrs['restrictionBase']) && $attrs['restrictionBase'] != ''){

+			if (isset($attrs['restrictionBase']) && $attrs['restrictionBase'] != '') {

 				$contentStr = "   <$schemaPrefix:restriction base=\"".$this->contractQName($attrs['restrictionBase'])."\">\n".$contentStr."   </$schemaPrefix:restriction>\n";

 				// complex or simple content

-				if ((isset($attrs['elements']) && count($attrs['elements']) > 0) || (isset($attrs['attrs']) && count($attrs['attrs']) > 0)){

+				if ((isset($attrs['elements']) && count($attrs['elements']) > 0) || (isset($attrs['attrs']) && count($attrs['attrs']) > 0)) {

 					$contentStr = "  <$schemaPrefix:complexContent>\n".$contentStr."  </$schemaPrefix:complexContent>\n";

 				}

 			}

 			// finalize complex type

-			if($contentStr != ''){

+			if ($contentStr != '') {

 				$contentStr = " <$schemaPrefix:complexType name=\"$typeName\">\n".$contentStr." </$schemaPrefix:complexType>\n";

 			} else {

 				$contentStr = " <$schemaPrefix:complexType name=\"$typeName\"/>\n";

@@ -623,8 +623,8 @@ 
 			$xml .= $contentStr;

 		}

 		// simple types

-		if(isset($this->simpleTypes) && count($this->simpleTypes) > 0){

-			foreach($this->simpleTypes as $typeName => $eParts){

+		if (isset($this->simpleTypes) && count($this->simpleTypes) > 0) {

+			foreach ($this->simpleTypes as $typeName => $eParts) {

 				$xml .= " <$schemaPrefix:simpleType name=\"$typeName\">\n  <$schemaPrefix:restriction base=\"".$this->contractQName($eParts['type'])."\">\n";

 				if (isset($eParts['enumeration'])) {

 					foreach ($eParts['enumeration'] as $e) {

@@ -635,14 +635,14 @@ 
 			}

 		}

 		// elements

-		if(isset($this->elements) && count($this->elements) > 0){

-			foreach($this->elements as $element => $eParts){

+		if (isset($this->elements) && count($this->elements) > 0) {

+			foreach ($this->elements as $element => $eParts) {

 				$xml .= " <$schemaPrefix:element name=\"$element\" type=\"".$this->contractQName($eParts['type'])."\"/>\n";

 			}

 		}

 		// attributes

-		if(isset($this->attributes) && count($this->attributes) > 0){

-			foreach($this->attributes as $attr => $aParts){

+		if (isset($this->attributes) && count($this->attributes) > 0) {

+			foreach ($this->attributes as $attr => $aParts) {

 				$xml .= " <$schemaPrefix:attribute name=\"$attr\" type=\"".$this->contractQName($aParts['type'])."\"\n/>";

 			}

 		}

@@ -657,7 +657,7 @@ 
 		foreach (array_diff($this->usedNamespaces, $this->enclosingNamespaces) as $nsp => $ns) {

 			$el .= " xmlns:$nsp=\"$ns\"";

 		}

-		$xml = $el . ">\n".$xml."</$schemaPrefix:schema>\n";

+		$xml = $el.">\n".$xml."</$schemaPrefix:schema>\n";

 		return $xml;

 	}

 

@@ -667,8 +667,8 @@ 
 	* @param    string $string debug data

 	* @access   private

 	*/

-	function xdebug($string){

-		$this->debug('<' . $this->schemaTargetNamespace . '> '.$string);

+	function xdebug($string) {

+		$this->debug('<'.$this->schemaTargetNamespace.'> '.$string);

 	}

 

     /**

@@ -683,11 +683,11 @@ 
     * @access public

     * @deprecated

     */

-	function getPHPType($type,$ns){

-		if(isset($this->typemap[$ns][$type])){

+	function getPHPType($type, $ns) {

+		if (isset($this->typemap[$ns][$type])) {

 			//print "found type '$type' and ns $ns in typemap<br>";

 			return $this->typemap[$ns][$type];

-		} elseif(isset($this->complexTypes[$type])){

+		} elseif (isset($this->complexTypes[$type])) {

 			//print "getting type '$type' and ns $ns from complexTypes array<br>";

 			return $this->complexTypes[$type]['phpType'];

 		}

@@ -716,7 +716,7 @@ 
     * @see addSimpleType

     * @see addElement

     */

-	function getTypeDef($type){

+	function getTypeDef($type) {

 		//$this->debug("in getTypeDef for type $type");

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

 			$is_element = 1;

@@ -725,10 +725,10 @@ 
 			$is_element = 0;

 		}

 

-		if((! $is_element) && isset($this->complexTypes[$type])){

+		if ((!$is_element) && isset($this->complexTypes[$type])) {

 			$this->xdebug("in getTypeDef, found complexType $type");

 			return $this->complexTypes[$type];

-		} elseif((! $is_element) && isset($this->simpleTypes[$type])){

+		} elseif ((!$is_element) && isset($this->simpleTypes[$type])) {

 			$this->xdebug("in getTypeDef, found simpleType $type");

 			if (!isset($this->simpleTypes[$type]['phpType'])) {

 				// get info for type to tack onto the simple type

@@ -748,7 +748,7 @@ 
 				}

 			}

 			return $this->simpleTypes[$type];

-		} elseif(isset($this->elements[$type])){

+		} elseif (isset($this->elements[$type])) {

 			$this->xdebug("in getTypeDef, found element $type");

 			if (!isset($this->elements[$type]['phpType'])) {

 				// get info for type to tack onto the element

@@ -773,7 +773,7 @@ 
 				}

 			}

 			return $this->elements[$type];

-		} elseif(isset($this->attributes[$type])){

+		} elseif (isset($this->attributes[$type])) {

 			$this->xdebug("in getTypeDef, found attribute $type");

 			return $this->attributes[$type];

 		} elseif (preg_match('/_ContainedType$/', $type)) {

@@ -795,23 +795,23 @@ 
     * @access public

     * @deprecated

     */

-    function serializeTypeDef($type){

+    function serializeTypeDef($type) {

     	//print "in sTD() for type $type<br>";

-	if($typeDef = $this->getTypeDef($type)){

+	if ($typeDef = $this->getTypeDef($type)) {

 		$str .= '<'.$type;

-	    if(is_array($typeDef['attrs'])){

-		foreach($typeDef['attrs'] as $attName => $data){

+	    if (is_array($typeDef['attrs'])) {

+		foreach ($typeDef['attrs'] as $attName => $data) {

 		    $str .= " $attName=\"{type = ".$data['type']."}\"";

 		}

 	    }

 	    $str .= " xmlns=\"".$this->schema['targetNamespace']."\"";

-	    if(count($typeDef['elements']) > 0){

+	    if (count($typeDef['elements']) > 0) {

 		$str .= ">";

-		foreach($typeDef['elements'] as $element => $eData){

+		foreach ($typeDef['elements'] as $element => $eData) {

 		    $str .= $this->serializeTypeDef($element);

 		}

 		$str .= "</$type>";

-	    } elseif($typeDef['typeClass'] == 'element') {

+	    } elseif ($typeDef['typeClass'] == 'element') {

 		$str .= "></$type>";

 	    } else {

 		$str .= "/>";

@@ -831,22 +831,22 @@ 
     * @access public

     * @deprecated

 	*/

-	function typeToForm($name,$type){

+	function typeToForm($name, $type) {

 		// get typedef

-		if($typeDef = $this->getTypeDef($type)){

+		if ($typeDef = $this->getTypeDef($type)) {

 			// if struct

-			if($typeDef['phpType'] == 'struct'){

+			if ($typeDef['phpType'] == 'struct') {

 				$buffer .= '<table>';

-				foreach($typeDef['elements'] as $child => $childDef){

+				foreach ($typeDef['elements'] as $child => $childDef) {

 					$buffer .= "

 					<tr><td align='right'>$childDef[name] (type: ".$this->getLocalPart($childDef['type'])."):</td>

 					<td><input type='text' name='parameters[".$name."][$childDef[name]]'></td></tr>";

 				}

 				$buffer .= '</table>';

 			// if array

-			} elseif($typeDef['phpType'] == 'array'){

+			} elseif ($typeDef['phpType'] == 'array') {

 				$buffer .= '<table>';

-				for($i=0;$i < 3; $i++){

+				for ($i = 0; $i < 3; $i++) {

 					$buffer .= "

 					<tr><td align='right'>array item (type: $typeDef[arrayType]):</td>

 					<td><input type='text' name='parameters[".$name."][]'></td></tr>";

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

 	* @see getTypeDef

 	*/

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

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

 		$this->complexTypes[$name] = array(

 	    'name'		=> $name,

 	    'typeClass'	=> $typeClass,

@@ -931,7 +931,7 @@ 
 	* @see nusoap_xmlschema

 	* @see getTypeDef

 	*/

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

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

 		$this->simpleTypes[$name] = array(

 	    'name'			=> $name,

 	    'typeClass'		=> $typeClass,

@@ -952,14 +952,14 @@ 
 	* @access public

 	*/

 	function addElement($attrs) {

-		if (! $this->getPrefix($attrs['type'])) {

-			$attrs['type'] = $this->schemaTargetNamespace . ':' . $attrs['type'];

+		if (!$this->getPrefix($attrs['type'])) {

+			$attrs['type'] = $this->schemaTargetNamespace.':'.$attrs['type'];

 		}

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

-		$this->elements[ $attrs['name'] ]['typeClass'] = 'element';

+		$this->elements[$attrs['name']] = $attrs;

+		$this->elements[$attrs['name']]['typeClass'] = 'element';

 		

-		$this->xdebug("addElement " . $attrs['name']);

-		$this->appendDebug($this->varDump($this->elements[ $attrs['name'] ]));

+		$this->xdebug("addElement ".$attrs['name']);

+		$this->appendDebug($this->varDump($this->elements[$attrs['name']]));

 	}

 }

 

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

Spacing +107 added lines, -107 removed lines

@@ -23,39 +23,39 @@ 
 * @version  $Id: class.soapclient.php,v 1.69 2010/04/26 20:15:08 snichol Exp $

 * @access   public

 */

-class nusoap_client extends nusoap_base  {

-

-	var $username = '';				// Username for HTTP authentication

-	var $password = '';				// Password for HTTP authentication

-	var $authtype = '';				// Type of HTTP authentication

-	var $certRequest = array();		// Certificate for HTTP SSL authentication

-	var $requestHeaders = false;	// SOAP headers in request (text)

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

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

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

+class nusoap_client extends nusoap_base {

+

+	var $username = ''; // Username for HTTP authentication

+	var $password = ''; // Password for HTTP authentication

+	var $authtype = ''; // Type of HTTP authentication

+	var $certRequest = array(); // Certificate for HTTP SSL authentication

+	var $requestHeaders = false; // SOAP headers in request (text)

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

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

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

 	var $endpoint;

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

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

     var $proxyhost = '';

     var $proxyport = '';

 	var $proxyusername = '';

 	var $proxypassword = '';

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

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

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

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

 	var $http_encoding = false;

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

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

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

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

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

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

 	var $persistentConnection = false;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 

 	/*

 	 * fault related variables

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

 	* @access   public

 	*/

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

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

 		parent::nusoap_base();

 		$this->endpoint = $endpoint;

 		$this->proxyhost = $proxyhost;

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

 

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

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

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

 

 		// make values

-		if($wsdl){

+		if ($wsdl) {

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

 				$this->wsdl = $endpoint;

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

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

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

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

 				$this->checkWSDL();

 			} else {

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

 				$this->wsdl = null;

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

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

 			}

 			$this->endpointType = 'wsdl';

 		} else {

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

 	* @access   public

 	*/

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

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

 		$this->operation = $operation;

 		$this->fault = false;

 		$this->setError('');

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

 		

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

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

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

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

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

 		if ($headers) {

 			$this->requestHeaders = $headers;

 		}

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

 		}

 		// serialize parameters

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

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

 			// use WSDL for operation

 			$this->opData = $opData;

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

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

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

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

 				$soapAction = $opData['soapAction'];

 			}

-			if (! $this->forceEndpoint) {

+			if (!$this->forceEndpoint) {

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

 			} else {

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

 			}

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

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

 			$style = $opData['style'];

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

 			// add ns to ns array

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

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

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

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

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

 			}

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

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

 			} elseif (is_array($params)) {

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

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

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

 			} else {

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

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

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

 				return false;

 			}

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

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

 			// operation not in WSDL

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

 			$this->wsdl->clearDebug();

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

 			// no WSDL

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

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

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

 			// serialize 

 			$payload = '';

 			if (is_string($params)) {

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

 			} elseif (is_array($params)) {

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

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

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

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

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

 				}

 			} else {

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

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

 				if ($namespace) {

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

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

-								$payload .

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

+								$payload.

 								"</$nsPrefix:$operation>";

 				} else {

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

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

 				}

 			} else {

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

 				if ($namespace) {

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

-								$payload .

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

+								$payload.

 								"</$nsPrefix:$operation>";

 				} else {

-					$payload = "<$operation>" .

-								$payload .

+					$payload = "<$operation>".

+								$payload.

 								"</$operation>";

 				}

 			}

 		}

 		// serialize envelope

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

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

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

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

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

 		// send

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

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

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

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

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

 			return false;

 		} else {

 			$this->return = $return;

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

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

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

 			

 			// fault?

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

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

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

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

 				$this->fault = true;

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

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

 					$this->$k = $v;

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

 				}

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

 			} else {

 				// array of return values

-				if(is_array($return)){

+				if (is_array($return)) {

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

 					// in the array

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

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

 						return $return;

 					}

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

@@ -372,7 +372,7 @@ 
 	 */

 	function loadWSDL() {

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

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

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

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

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

 		$this->checkWSDL();

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

 	* @access   public

 	*/

-	function getOperationData($operation){

+	function getOperationData($operation) {

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

 			$this->loadWSDL();

 			if ($this->getError())

 				return false;

 		}

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

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

 			return $this->operations[$operation];

 		}

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

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

 	* @access   private

 	*/

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

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

 		$this->checkCookies();

 		// detect transport

-		switch(true){

+		switch (true) {

 			// http(s)

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

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

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

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

-					$http =& $this->persistentConnection;

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

+					$http = & $this->persistentConnection;

 				} else {

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

 					if ($this->persistentConnection) {

@@ -428,27 +428,27 @@ 
 				}

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

 				$http->setSOAPAction($soapaction);

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

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

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

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

 				}

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

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

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

 				}

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

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

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

 				}

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

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

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

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

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

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

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

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

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

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

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

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

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

 					//} else

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

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

 				} else {

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

 				}

@@ -465,13 +465,13 @@ 
 					}

 				}

 				

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

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

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

 					return false;

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

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

 					return false;

 				} else {

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

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

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

 				}

 			break;

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

 	*/

     function parseResponse($headers, $data) {

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

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

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

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

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

 			return false;

     	}

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

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

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

 			return false;

 		}

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

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

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

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

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

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

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

 			} else {

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

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

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

 		}

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

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

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

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

 		// add parser debug data to our debug

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

 		// if parse errors

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

-			$this->setError( $errstr);

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

+			$this->setError($errstr);

 			// destroy the parser object

 			unset($parser);

 			return false;

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

 	* @access   public

 	*/

-	function setHeaders($headers){

+	function setHeaders($headers) {

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

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

 		$this->requestHeaders = $headers;

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

 	* @access   public

 	*/

-	function getHeaders(){

+	function getHeaders() {

 		return $this->responseHeaders;

 	}

 

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

 	* @access   public

 	*/

-	function getHeader(){

+	function getHeader() {

 		return $this->responseHeader;

 	}

 

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

 	* @access   public

 	*/

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

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

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

 		$this->http_encoding = $enc;

 	}

@@ -656,7 +656,7 @@ 
 	*

 	* @access   public

 	*/

-	function useHTTPPersistentConnection(){

+	function useHTTPPersistentConnection() {

 		$this->debug("useHTTPPersistentConnection");

 		$this->persistentConnection = true;

 	}

@@ -748,7 +748,7 @@ 
 	*/

 	function _getProxyClassCode($r) {

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

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

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

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

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

 			$this->setError($evalStr);

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

 			$this->loadWSDL();

 			if ($this->getError()) {

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

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

 			}

 		}

 		$evalStr = '';

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

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

 					}

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

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

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

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

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

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

 				} else {

 					$paramStr = '';

 					$paramArrayStr = '';

@@ -784,7 +784,7 @@ 
 				}

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

 				$evalStr .= "// $paramCommentStr

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

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

 		\$params = array($paramArrayStr);

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

 	}

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

     * @access   public

     */

-    function decodeUTF8($bool){

+    function decodeUTF8($bool) {

 		$this->decode_utf8 = $bool;

 		return true;

     }

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

 			return true;

 		}

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

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

 		$curr_cookies = $this->cookies;

 		$this->cookies = array();

 		foreach ($curr_cookies as $cookie) {

-			if (! is_array($cookie)) {

+			if (!is_array($cookie)) {

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

 				continue;

 			}

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

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

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

 					$this->cookies[] = $cookie;

 				} else {

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

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

 				}

 			} else {

 				$this->cookies[] = $cookie;

@@ -969,11 +969,11 @@ 
 				}

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

 				$found = true;

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

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

 				break;

 			}

-			if (! $found) {

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

+			if (!$found) {

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

 				$this->cookies[] = $newCookie;

 			}

 		}