chamilo / chamilo-lms

main/inc/lib/system_announcements.lib.php

Spacing +39 added lines, -39 removed lines

@@ -22,14 +22,14 @@ 
         $tbl_announcement_group = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS_GROUPS);
 		$userGroup = new UserGroup();
 
-        $temp_user_groups = $userGroup->get_groups_by_user(api_get_user_id(),0);
+        $temp_user_groups = $userGroup->get_groups_by_user(api_get_user_id(), 0);
         $groups = array();
         foreach ($temp_user_groups as $user_group) {
             $groups = array_merge($groups, array($user_group['id']));
             $groups = array_merge($groups, $userGroup->get_parent_groups($user_group['id']));
         }
 
-        $groups_string = '('.implode($groups,',').')';
+        $groups_string = '('.implode($groups, ',').')';
         $now = api_get_utc_datetime();
         $sql = "SELECT *, DATE_FORMAT(date_start,'%d-%m-%Y %h:%i:%s') AS display_date
 				FROM  $db_table
@@ -104,13 +104,13 @@ 
      * @param string $user_id
      * @return string
      */
-    public static function display_all_announcements($visible, $id = -1, $start = 0,$user_id='')
+    public static function display_all_announcements($visible, $id = -1, $start = 0, $user_id = '')
     {
 		$user_selected_language = api_get_interface_language();
-		$start	= intval($start);
+		$start = intval($start);
         $userGroup = new UserGroup();
 	    $tbl_announcement_group = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS_GROUPS);
-	    $temp_user_groups = $userGroup->get_groups_by_user(api_get_user_id(),0);
+	    $temp_user_groups = $userGroup->get_groups_by_user(api_get_user_id(), 0);
         $groups = array();
 	    foreach ($temp_user_groups as $user_group) {
 	        $groups = array_merge($groups, array($user_group['id']));
@@ -118,10 +118,10 @@ 
 	    }
 
 	    // Checks if tables exists to not break platform not updated
-	    $groups_string = '('.implode($groups,',').')';
+	    $groups_string = '('.implode($groups, ',').')';
 
 		$db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
-		$now  = api_get_utc_datetime();
+		$now = api_get_utc_datetime();
 
 		$sql = "SELECT * FROM ".$db_table."
 				WHERE
@@ -152,10 +152,10 @@ 
             $sql .= " AND access_url_id IN ('1', '$current_access_url_id')";
 		}
 
-		if(!isset($_GET['start']) || $_GET['start'] == 0) {
+		if (!isset($_GET['start']) || $_GET['start'] == 0) {
 			$sql .= " ORDER BY date_start DESC LIMIT ".$start.",20";
 		} else {
-			$sql .= " ORDER BY date_start DESC LIMIT ".($start+1).",20";
+			$sql .= " ORDER BY date_start DESC LIMIT ".($start + 1).",20";
 		}
 		$announcements = Database::query($sql);
 		$content = '';
@@ -207,13 +207,13 @@ 
      */
     public static function display_arrow($user_id)
     {
-		$start = (int)$_GET['start'];
-		$nb_announcement = SystemAnnouncementManager :: count_nb_announcement($start,$user_id);
-		$next = ((int)$_GET['start']+19);
-		$prev = ((int)$_GET['start']-19);
+		$start = (int) $_GET['start'];
+		$nb_announcement = SystemAnnouncementManager :: count_nb_announcement($start, $user_id);
+		$next = ((int) $_GET['start'] + 19);
+		$prev = ((int) $_GET['start'] - 19);
 		$content = '';
-		if(!isset($_GET['start']) || $_GET['start'] == 0) {
-			if($nb_announcement > 20) {
+		if (!isset($_GET['start']) || $_GET['start'] == 0) {
+			if ($nb_announcement > 20) {
 				$content .= '<a href="news_list.php?start='.$next.'">'.get_lang('NextBis').' >> </a>';
 			}
 		} else {
@@ -322,15 +322,15 @@ 
         $sendEmailTest = false
     ) {
 		$original_content = $content;
-		$a_dateS = explode(' ',$date_start);
-		$a_arraySD = explode('-',$a_dateS[0]);
-		$a_arraySH = explode(':',$a_dateS[1]);
-		$date_start_to_compare = array_merge($a_arraySD,$a_arraySH);
+		$a_dateS = explode(' ', $date_start);
+		$a_arraySD = explode('-', $a_dateS[0]);
+		$a_arraySH = explode(':', $a_dateS[1]);
+		$date_start_to_compare = array_merge($a_arraySD, $a_arraySH);
 
-		$a_dateE = explode(' ',$date_end);
-		$a_arrayED = explode('-',$a_dateE[0]);
-		$a_arrayEH = explode(':',$a_dateE[1]);
-		$date_end_to_compare = array_merge($a_arrayED,$a_arrayEH);
+		$a_dateE = explode(' ', $date_end);
+		$a_arrayED = explode('-', $a_dateE[0]);
+		$a_arrayEH = explode(':', $a_dateE[1]);
+		$date_end_to_compare = array_merge($a_arrayED, $a_arrayEH);
 
 		$db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
 
@@ -504,15 +504,15 @@ 
         $send_mail = 0,
         $sendEmailTest = false
     ) {
-		$a_dateS = explode(' ',$date_start);
-		$a_arraySD = explode('-',$a_dateS[0]);
-		$a_arraySH = explode(':',$a_dateS[1]);
-		$date_start_to_compare = array_merge($a_arraySD,$a_arraySH);
+		$a_dateS = explode(' ', $date_start);
+		$a_arraySD = explode('-', $a_dateS[0]);
+		$a_arraySH = explode(':', $a_dateS[1]);
+		$date_start_to_compare = array_merge($a_arraySD, $a_arraySH);
 
-		$a_dateE = explode(' ',$date_end);
-		$a_arrayED = explode('-',$a_dateE[0]);
-		$a_arrayEH = explode(':',$a_dateE[1]);
-		$date_end_to_compare = array_merge($a_arrayED,$a_arrayEH);
+		$a_dateE = explode(' ', $date_end);
+		$a_arrayED = explode('-', $a_dateE[0]);
+		$a_arrayEH = explode(':', $a_dateE[1]);
+		$date_end_to_compare = array_merge($a_arrayED, $a_arrayEH);
 
 		$langsql = is_null($lang) ? 'NULL' : "'".Database::escape_string($lang)."'";
 		$db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
@@ -536,8 +536,8 @@ 
 			return false;
 		}
 
-	    $start    = api_get_utc_datetime($date_start);
-        $end      = api_get_utc_datetime($date_end);
+	    $start = api_get_utc_datetime($date_start);
+        $end = api_get_utc_datetime($date_end);
 
 		$title = Database::escape_string($title);
 		$content = Database::escape_string($content);
@@ -560,7 +560,7 @@ 
                 $sendEmailTest
             );
         } else {
-            if ($send_mail==1) {
+            if ($send_mail == 1) {
                 SystemAnnouncementManager::send_system_announcement_by_email(
                     $title,
                     $content,
@@ -655,7 +655,7 @@ 
 		global $charset;
 
         $title = api_html_entity_decode(stripslashes($title), ENT_QUOTES, $charset);
-        $content = api_html_entity_decode(stripslashes(str_replace(array('\r\n', '\n', '\r'),'', $content)), ENT_QUOTES, $charset);
+        $content = api_html_entity_decode(stripslashes(str_replace(array('\r\n', '\n', '\r'), '', $content)), ENT_QUOTES, $charset);
         $now = api_get_utc_datetime();
 
         if ($sendEmailTest) {
@@ -678,7 +678,7 @@ 
 			$sql = "SELECT DISTINCT u.user_id FROM $user_table u $url_condition WHERE status = '5' ";
 		}
 
-		if ($teacher<> 0 AND $student <> 0) {
+		if ($teacher <> 0 AND $student <> 0) {
 			$sql = "SELECT DISTINCT u.user_id FROM $user_table u $url_condition WHERE 1 = 1 ";
 		}
 
@@ -696,7 +696,7 @@ 
         // Expiration date
         $sql .= " AND (expiration_date = '' OR expiration_date IS NULL OR expiration_date > '$now') ";
 
-		if ((empty($teacher) or $teacher == '0') AND  (empty($student) or $student == '0')) {
+		if ((empty($teacher) or $teacher == '0') AND (empty($student) or $student == '0')) {
 			return true;
 		}
 
@@ -707,7 +707,7 @@ 
 
         $message_sent = false;
 
-		while ($row = Database::fetch_array($result,'ASSOC')) {
+		while ($row = Database::fetch_array($result, 'ASSOC')) {
             MessageManager::send_message_simple($row['user_id'], $title, $content);
             $message_sent = true;
 		}
@@ -727,7 +727,7 @@ 
         $cut_size = 500;
         $now = api_get_utc_datetime();
 
-        $sql = "SELECT * FROM " . $table . "
+        $sql = "SELECT * FROM ".$table."
 				WHERE
 				    (lang = '$user_selected_language' OR lang = '') AND
 				    ('$now' >= date_start AND '$now' <= date_end) ";

main/inc/lib/dashboard.lib.php

Spacing +13 added lines, -13 removed lines

@@ -52,7 +52,7 @@ 
 
                 echo '<tr>';
                 self::display_dashboard_plugin_checkboxes($testplugin);
-                for ($i = 0 ; $i < count($table_cols); $i++) {
+                for ($i = 0; $i < count($table_cols); $i++) {
                     if (isset($plugin_info[strtolower($table_cols[$i])])) {
                         echo '<td>';
                         echo $plugin_info[$table_cols[$i]];
@@ -67,7 +67,7 @@ 
                     echo Display::tag(
                         'tr',
                         Display::tag('td',
-                            get_lang('CheckFilePermissions') . ' ' . Security::remove_XSS($plugin_info_file),
+                            get_lang('CheckFilePermissions').' '.Security::remove_XSS($plugin_info_file),
                             array('colspan' => '3'))
                     );
                 }
@@ -79,7 +79,7 @@ 
             foreach ($disabled_blocks_data as $disabled_block) {
                 echo '<tr style="background-color:#eee">';
                 echo '<td><center><input type="checkbox" name="disabled_block" value="true" checked disabled /></center>';
-                for ($j = 0 ; $j < count($table_cols); $j++) {
+                for ($j = 0; $j < count($table_cols); $j++) {
                     if (isset($disabled_block[strtolower($table_cols[$j])])) {
                         if ($j == 2) {
                             echo '<td>';
@@ -189,10 +189,10 @@ 
             }
             // clean from block data
             if (!empty($not_selected_blocks_id)) {
-                $sql_check = "SELECT id FROM $tbl_block WHERE id IN(".implode(',',$not_selected_blocks_id).")";
+                $sql_check = "SELECT id FROM $tbl_block WHERE id IN(".implode(',', $not_selected_blocks_id).")";
                 $rs_check = Database::query($sql_check);
                 if (Database::num_rows($rs_check) > 0) {
-                    $del = "DELETE FROM $tbl_block WHERE id IN(".implode(',',$not_selected_blocks_id).")";
+                    $del = "DELETE FROM $tbl_block WHERE id IN(".implode(',', $not_selected_blocks_id).")";
                     Database::query($del);
                 }
             }
@@ -212,7 +212,7 @@ 
                         $affected_rows = Database::affected_rows($result);
                     } else {
                         // insert
-                        $plugin_info_file = $dashboard_pluginpath . $testplugin . "/$testplugin.info";
+                        $plugin_info_file = $dashboard_pluginpath.$testplugin."/$testplugin.info";
                         $plugin_info = array();
                         if (file_exists($plugin_info_file)) {
                             $plugin_info = parse_info_file($plugin_info_file);
@@ -282,10 +282,10 @@ 
 		// We check if plugin exists inside directory for updating active field
 		$sql = "SELECT * FROM $tbl_block";
 		$rs = Database::query($sql);
-		if (Database::num_rows($rs) > 0){
+		if (Database::num_rows($rs) > 0) {
 			while ($row = Database::fetch_array($rs)) {
 				$path = $row['path'];
-				if (!in_array($row['path'],$possibleplugins)) {
+				if (!in_array($row['path'], $possibleplugins)) {
 					$active = 0;
 				} else {
 					$active = 1;
@@ -390,13 +390,13 @@ 
 					echo '<td>'.$block['description'].'</td>';
 					echo '<td>
                             <select class="selectpicker show-tick form-control" name="columns['.$block['id'].']">
-                            <option value="1" '.(isset($user_block_data[$block['id']]) && $user_block_data[$block['id']]['column']==1?'selected':'').' >1</option>
-                            <option value="2" '.(isset($user_block_data[$block['id']]) && $user_block_data[$block['id']]['column']==2?'selected':'').' >2</option>
+                            <option value="1" '.(isset($user_block_data[$block['id']]) && $user_block_data[$block['id']]['column'] == 1 ? 'selected' : '').' >1</option>
+                            <option value="2" '.(isset($user_block_data[$block['id']]) && $user_block_data[$block['id']]['column'] == 2 ? 'selected' : '').' >2</option>
                             </select>
                           </td>';
 					echo '</tr>';
 				} else {
-					echo Display::tag('tr',  Display::tag('td', get_lang('Error').' '.$controller_class, array('colspan'=>'3')));
+					echo Display::tag('tr', Display::tag('td', get_lang('Error').' '.$controller_class, array('colspan'=>'3')));
 				}
 			}
 
@@ -475,10 +475,10 @@ 
 		$user_id = intval($user_id);
 		$field_variable = 'dashboard';
 		$extra_user_data = UserManager::get_extra_user_data_by_field($user_id, $field_variable);
-		$extra_user_data = explode(';',$extra_user_data[$field_variable]);
+		$extra_user_data = explode(';', $extra_user_data[$field_variable]);
 		$data = array();
 		foreach ($extra_user_data as $extra) {
-			$split_extra = explode(':',$extra);
+			$split_extra = explode(':', $extra);
 			if (!empty($split_extra)) {
 				$block_id = $split_extra[0];
 				$column = isset($split_extra[1]) ? $split_extra[1] : null;

main/inc/lib/events_email.class.php

Spacing +14 added lines, -14 removed lines

@@ -124,7 +124,7 @@ 
 
                 // If the mail only need to be send once (we know that thanks to the events.conf), we log it in the table
                 if ($event_config[$event_name]["sending_mail_once"]) {
-                    $sql = 'INSERT INTO ' . Database::get_main_table(TABLE_EVENT_SENT) . ' (user_from, user_to, event_type_name)
+                    $sql = 'INSERT INTO '.Database::get_main_table(TABLE_EVENT_SENT).' (user_from, user_to, event_type_name)
                             VALUES ('.$event_data["user_id"].', '.$id.' ,"'.Database::escape_string($event_name).'")
                     ';
                     Database::query($sql);
@@ -135,9 +135,9 @@ 
         // Second, we send to people linked to the event
         // So, we get everyone
         $sql = 'SELECT u.user_id, u.language, u.email, u.firstname, u.lastname
-                FROM ' . Database::get_main_table(TABLE_EVENT_TYPE_REL_USER) . ' ue
+                FROM ' . Database::get_main_table(TABLE_EVENT_TYPE_REL_USER).' ue
                 INNER JOIN '.Database::get_main_table(TABLE_MAIN_USER).' u ON u.user_id = ue.user_id
-                WHERE event_type_name = "' . $event_name . '"';
+                WHERE event_type_name = "' . $event_name.'"';
         $result = Database::store_result(Database::query($sql), 'ASSOC');
         // for each of the linked users
         foreach ($result as $key => $value) {
@@ -177,7 +177,7 @@ 
 
             // If the mail only need to be send once (we know that thanks to the events.conf, we log it in the table
             if ($event_config[$event_name]["sending_mail_once"]) {
-                $sql = 'INSERT INTO ' . Database::get_main_table(TABLE_EVENT_SENT) . '
+                $sql = 'INSERT INTO '.Database::get_main_table(TABLE_EVENT_SENT).'
                     (user_from, user_to, event_type_name)
                     VALUES ('.$event_data["user_id"].', '.$value["user_id"].' , "'.Database::escape_string($event_name).'");
                     ';
@@ -202,16 +202,16 @@ 
         $current_language = api_get_interface_language();
 
         $sql = 'SELECT COUNT(*) as total
-                FROM ' . Database::get_main_table(TABLE_EVENT_EMAIL_TEMPLATE) . ' em
-                INNER JOIN ' . Database::get_main_table(TABLE_MAIN_LANGUAGE) . ' l
+                FROM ' . Database::get_main_table(TABLE_EVENT_EMAIL_TEMPLATE).' em
+                INNER JOIN ' . Database::get_main_table(TABLE_MAIN_LANGUAGE).' l
                 ON em.language_id = l.id
                 WHERE
-                    em.event_type_name = "' . $event_name . '" and
+                    em.event_type_name = "' . $event_name.'" and
                     l.dokeos_folder = "'.$current_language.'" and
                     em.activated = 1';
 
         $exists = Database::store_result(Database::query($sql), 'ASSOC');
-        if ($exists[0]["total"])  {
+        if ($exists[0]["total"]) {
             return true;
         } else {
             return false;
@@ -228,12 +228,12 @@ 
     private static function getMessage($event_name, $language)
     {
         $sql = 'SELECT message, subject, l.dokeos_folder
-                FROM ' . Database::get_main_table(TABLE_EVENT_EMAIL_TEMPLATE) . ' em
-                INNER JOIN ' . Database::get_main_table(TABLE_MAIN_LANGUAGE) . ' l
+                FROM ' . Database::get_main_table(TABLE_EVENT_EMAIL_TEMPLATE).' em
+                INNER JOIN ' . Database::get_main_table(TABLE_MAIN_LANGUAGE).' l
                 ON em.language_id = l.id
                 WHERE
-                    em.event_type_name = "' . $event_name . '" AND
-                    (l.dokeos_folder = "' . $language . '" OR l.dokeos_folder = "english") AND
+                    em.event_type_name = "' . $event_name.'" AND
+                    (l.dokeos_folder = "' . $language.'" OR l.dokeos_folder = "english") AND
                     em.message <> ""
                 ';
         return Database::store_result(Database::query($sql), 'ASSOC');
@@ -274,8 +274,8 @@ 
     private static function formatMessage(&$message, &$subject, $event_config, $event_name, &$event_data)
     {
         foreach ($event_config[$event_name]["available_keyvars"] as $key => $word) {
-            $message = str_replace('((' . $key . '))', $event_data[$word], $message);
-            $subject = str_replace('((' . $key . '))', $event_data[$word], $subject);
+            $message = str_replace('(('.$key.'))', $event_data[$word], $message);
+            $subject = str_replace('(('.$key.'))', $event_data[$word], $subject);
         }
     }
 }

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

 			}

 		}

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

Spacing +85 added lines, -85 removed lines

@@ -170,7 +170,7 @@ 
     * @param mixed $wsdl file path or URL (string), or wsdl instance (object)

 	* @access   public

 	*/

-	function nusoap_server($wsdl=false){

+	function nusoap_server($wsdl = false) {

 		parent::nusoap_base();

 		// turn on debugging?

 		global $debug;

@@ -193,7 +193,7 @@ 
 			$qs = explode('&', $_SERVER['QUERY_STRING']);

 			foreach ($qs as $v) {

 				if (substr($v, 0, 6) == 'debug=') {

-					$this->debug("In nusoap_server, set debug_flag=" . substr($v, 6) . " based on query string #1");

+					$this->debug("In nusoap_server, set debug_flag=".substr($v, 6)." based on query string #1");

 					$this->debug_flag = substr($v, 6);

 				}

 			}

@@ -201,27 +201,27 @@ 
 			$qs = explode('&', $HTTP_SERVER_VARS['QUERY_STRING']);

 			foreach ($qs as $v) {

 				if (substr($v, 0, 6) == 'debug=') {

-					$this->debug("In nusoap_server, set debug_flag=" . substr($v, 6) . " based on query string #2");

+					$this->debug("In nusoap_server, set debug_flag=".substr($v, 6)." based on query string #2");

 					$this->debug_flag = substr($v, 6);

 				}

 			}

 		}

 

 		// wsdl

-		if($wsdl){

+		if ($wsdl) {

 			$this->debug("In nusoap_server, WSDL is specified");

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

 				$this->wsdl = $wsdl;

 				$this->externalWSDLURL = $this->wsdl->wsdl;

-				$this->debug('Use existing wsdl instance from ' . $this->externalWSDLURL);

+				$this->debug('Use existing wsdl instance from '.$this->externalWSDLURL);

 			} else {

-				$this->debug('Create wsdl from ' . $wsdl);

+				$this->debug('Create wsdl from '.$wsdl);

 				$this->wsdl = new wsdl($wsdl);

 				$this->externalWSDLURL = $wsdl;

 			}

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

 			$this->wsdl->clearDebug();

-			if($err = $this->wsdl->getError()){

+			if ($err = $this->wsdl->getError()) {

 				die('WSDL ERROR: '.$err);

 			}

 		}

@@ -233,7 +233,7 @@ 
 	* @param    string $data usually is the value of $HTTP_RAW_POST_DATA

 	* @access   public

 	*/

-	function service($data){

+	function service($data) {

 		global $HTTP_SERVER_VARS;

 

 		if (isset($_SERVER['REQUEST_METHOD'])) {

@@ -251,21 +251,21 @@ 
 		} else {

 			$qs = '';

 		}

-		$this->debug("In service, request method=$rm query string=$qs strlen(\$data)=" . strlen($data));

+		$this->debug("In service, request method=$rm query string=$qs strlen(\$data)=".strlen($data));

 

 		if ($rm == 'POST') {

 			$this->debug("In service, invoke the request");

 			$this->parse_request($data);

-			if (! $this->fault) {

+			if (!$this->fault) {

 				$this->invoke_method();

 			}

-			if (! $this->fault) {

+			if (!$this->fault) {

 				$this->serialize_return();

 			}

 			$this->send_response();

-		} elseif (preg_match('/wsdl/', $qs) ){

+		} elseif (preg_match('/wsdl/', $qs)) {

 			$this->debug("In service, this is a request for WSDL");

-			if ($this->externalWSDLURL){

+			if ($this->externalWSDLURL) {

               if (strpos($this->externalWSDLURL, "http://") !== false) { // assume URL

 				$this->debug("In service, re-direct for WSDL");

 				header('Location: '.$this->externalWSDLURL);

@@ -322,23 +322,23 @@ 
 

 		$this->request = '';

 		$this->SOAPAction = '';

-		if(function_exists('getallheaders')){

+		if (function_exists('getallheaders')) {

 			$this->debug("In parse_http_headers, use getallheaders");

 			$headers = getallheaders();

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

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

 				$k = strtolower($k);

 				$this->headers[$k] = $v;

 				$this->request .= "$k: $v\r\n";

 				$this->debug("$k: $v");

 			}

 			// get SOAPAction header

-			if(isset($this->headers['soapaction'])){

-				$this->SOAPAction = str_replace('"','',$this->headers['soapaction']);

+			if (isset($this->headers['soapaction'])) {

+				$this->SOAPAction = str_replace('"', '', $this->headers['soapaction']);

 			}

 			// get the character encoding of the incoming request

-			if(isset($this->headers['content-type']) && strpos($this->headers['content-type'],'=')){

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

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

+			if (isset($this->headers['content-type']) && strpos($this->headers['content-type'], '=')) {

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

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

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

 				} else {

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

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

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

 			}

-		} elseif(isset($_SERVER) && is_array($_SERVER)){

+		} elseif (isset($_SERVER) && is_array($_SERVER)) {

 			$this->debug("In parse_http_headers, use _SERVER");

 			foreach ($_SERVER as $k => $v) {

 				if (substr($k, 0, 5) == 'HTTP_') {

@@ -367,7 +367,7 @@ 
 						$enc = substr(strstr($v, '='), 1);

 						$enc = str_replace('"', '', $enc);

 						$enc = str_replace('\\', '', $enc);

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

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

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

 						} else {

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

@@ -385,9 +385,9 @@ 
 			$this->debug("In parse_http_headers, use HTTP_SERVER_VARS");

 			foreach ($HTTP_SERVER_VARS as $k => $v) {

 				if (substr($k, 0, 5) == 'HTTP_') {

-					$k = str_replace(' ', '-', strtolower(str_replace('_', ' ', substr($k, 5)))); 	                                         $k = strtolower(substr($k, 5));

+					$k = str_replace(' ', '-', strtolower(str_replace('_', ' ', substr($k, 5)))); $k = strtolower(substr($k, 5));

 				} else {

-					$k = str_replace(' ', '-', strtolower(str_replace('_', ' ', $k))); 	                                         $k = strtolower($k);

+					$k = str_replace(' ', '-', strtolower(str_replace('_', ' ', $k))); $k = strtolower($k);

 				}

 				if ($k == 'soapaction') {

 					// get SOAPAction header

@@ -401,7 +401,7 @@ 
 						$enc = substr(strstr($v, '='), 1);

 						$enc = str_replace('"', '', $enc);

 						$enc = str_replace('\\', '', $enc);

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

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

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

 						} else {

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

@@ -443,13 +443,13 @@ 
 	* @param    string $data XML string

 	* @access   private

 	*/

-	function parse_request($data='') {

+	function parse_request($data = '') {

 		$this->debug('entering parse_request()');

 		$this->parse_http_headers();

 		$this->debug('got character encoding: '.$this->xml_encoding);

 		// uncompress if necessary

 		if (isset($this->headers['content-encoding']) && $this->headers['content-encoding'] != '') {

-			$this->debug('got content encoding: ' . $this->headers['content-encoding']);

+			$this->debug('got content encoding: '.$this->headers['content-encoding']);

 			if ($this->headers['content-encoding'] == 'deflate' || $this->headers['content-encoding'] == 'gzip') {

 		    	// if decoding works, use it. else assume data wasn't gzencoded

 				if (function_exists('gzuncompress')) {

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

 	*/

 	function invoke_method() {

-		$this->debug('in invoke_method, methodname=' . $this->methodname . ' methodURI=' . $this->methodURI . ' SOAPAction=' . $this->SOAPAction);

+		$this->debug('in invoke_method, methodname='.$this->methodname.' methodURI='.$this->methodURI.' SOAPAction='.$this->SOAPAction);

 

 		//

 		// if you are debugging in this area of the code, your service uses a class to implement methods,

@@ -506,16 +506,16 @@ 
 		$orig_methodname = $this->methodname;

 		if ($this->wsdl) {

 			if ($this->opData = $this->wsdl->getOperationData($this->methodname)) {

-				$this->debug('in invoke_method, found WSDL operation=' . $this->methodname);

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

+				$this->debug('in invoke_method, found WSDL operation='.$this->methodname);

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

 			} elseif ($this->opData = $this->wsdl->getOperationDataForSoapAction($this->SOAPAction)) {

 				// Note: hopefully this case will only be used for doc/lit, since rpc services should have wrapper element

-				$this->debug('in invoke_method, found WSDL soapAction=' . $this->SOAPAction . ' for operation=' . $this->opData['name']);

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

+				$this->debug('in invoke_method, found WSDL soapAction='.$this->SOAPAction.' for operation='.$this->opData['name']);

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

 				$this->methodname = $this->opData['name'];

 			} else {

-				$this->debug('in invoke_method, no WSDL for operation=' . $this->methodname);

-				$this->fault('SOAP-ENV:Client', "Operation '" . $this->methodname . "' is not defined in the WSDL for this service");

+				$this->debug('in invoke_method, no WSDL for operation='.$this->methodname);

+				$this->fault('SOAP-ENV:Client', "Operation '".$this->methodname."' is not defined in the WSDL for this service");

 				return;

 			}

 		} else {

@@ -556,7 +556,7 @@ 
 			if (!function_exists($this->methodname)) {

 				$this->debug("in invoke_method, function '$this->methodname' not found!");

 				$this->result = 'fault: method not found';

-				$this->fault('SOAP-ENV:Client',"method '$this->methodname'('$orig_methodname') not defined in service('$try_class' '$delim')");

+				$this->fault('SOAP-ENV:Client', "method '$this->methodname'('$orig_methodname') not defined in service('$try_class' '$delim')");

 				return;

 			}

 		} else {

@@ -564,19 +564,19 @@ 
 			if (!in_array($method_to_compare, get_class_methods($class))) {

 				$this->debug("in invoke_method, method '$this->methodname' not found in class '$class'!");

 				$this->result = 'fault: method not found';

-				$this->fault('SOAP-ENV:Client',"method '$this->methodname'/'$method_to_compare'('$orig_methodname') not defined in service/'$class'('$try_class' '$delim')");

+				$this->fault('SOAP-ENV:Client', "method '$this->methodname'/'$method_to_compare'('$orig_methodname') not defined in service/'$class'('$try_class' '$delim')");

 				return;

 			}

 		}

 

 		// evaluate message, getting back parameters

 		// verify that request parameters match the method's signature

-		if(! $this->verify_method($this->methodname,$this->methodparams)){

+		if (!$this->verify_method($this->methodname, $this->methodparams)) {

 			// debug

 			$this->debug('ERROR: request not verified against method signature');

 			$this->result = 'fault: request failed validation against method signature';

 			// return fault

-			$this->fault('SOAP-ENV:Client',"Operation '$this->methodname' not defined in service.");

+			$this->fault('SOAP-ENV:Client', "Operation '$this->methodname' not defined in service.");

 			return;

 		}

 

@@ -616,13 +616,13 @@ 
 		} else {

 			if ($class == '') {

 				$this->debug('in invoke_method, calling function using call_user_func_array()');

-				$call_arg = "$this->methodname";	// straight assignment changes $this->methodname to lower case after call_user_func_array()

+				$call_arg = "$this->methodname"; // straight assignment changes $this->methodname to lower case after call_user_func_array()

 			} elseif ($delim == '..') {

 				$this->debug('in invoke_method, calling class method using call_user_func_array()');

-				$call_arg = array ($class, $method);

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

@@ -648,7 +648,7 @@ 
 	* @access   private

 	*/

 	function serialize_return() {

-		$this->debug('Entering serialize_return methodname: ' . $this->methodname . ' methodURI: ' . $this->methodURI);

+		$this->debug('Entering serialize_return methodname: '.$this->methodname.' methodURI: '.$this->methodURI);

 		// if fault

 		if (isset($this->methodreturn) && is_object($this->methodreturn) && ((get_class($this->methodreturn) == 'soap_fault') || (get_class($this->methodreturn) == 'nusoap_fault'))) {

 			$this->debug('got a fault object from method');

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

 			$this->debug('got a(n) '.gettype($this->methodreturn).' from method');

 			$this->debug('serializing return value');

-			if($this->wsdl){

+			if ($this->wsdl) {

 				$opParams = "";

 				if (sizeof($this->opData['output']['parts']) > 1) {

 					$this->debug('more than one output part, so use the method return unchanged');

@@ -673,10 +673,10 @@ 
 			    	//}

 			    	$opParams = array($this->methodreturn);

 			    }

-			    $return_val = $this->wsdl->serializeRPCParameters($this->methodname,'output',$opParams);

+			    $return_val = $this->wsdl->serializeRPCParameters($this->methodname, 'output', $opParams);

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

 			    $this->wsdl->clearDebug();

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

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

 					$this->debug('got wsdl error: '.$errstr);

 					$this->fault('SOAP-ENV:Server', 'unable to serialize result');

 					return;

@@ -695,9 +695,9 @@ 
 

 		$this->debug('serializing response');

 		if ($this->wsdl) {

-			$this->debug('have WSDL for serialization: style is ' . $this->opData['style']);

+			$this->debug('have WSDL for serialization: style is '.$this->opData['style']);

 			if ($this->opData['style'] == 'rpc') {

-				$this->debug('style is rpc for serialization: use is ' . $this->opData['output']['use']);

+				$this->debug('style is rpc for serialization: use is '.$this->opData['output']['use']);

 				if ($this->opData['output']['use'] == 'literal') {

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

 					if ($this->methodURI) {

@@ -721,7 +721,7 @@ 
 			$payload = '<ns1:'.$this->methodname.'Response xmlns:ns1="'.$this->methodURI.'">'.$return_val.'</ns1:'.$this->methodname."Response>";

 		}

 		$this->result = 'successful';

-		if($this->wsdl){

+		if ($this->wsdl) {

 			//if($this->debug_flag){

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

             //	}

@@ -731,9 +731,9 @@ 
 				$encodingStyle = '';

 			}

 			// Added: In case we use a WSDL, return a serialized env. WITH the usedNamespaces.

-			$this->responseSOAP = $this->serializeEnvelope($payload,$this->responseHeaders,$this->wsdl->usedNamespaces,$this->opData['style'],$this->opData['output']['use'],$encodingStyle);

+			$this->responseSOAP = $this->serializeEnvelope($payload, $this->responseHeaders, $this->wsdl->usedNamespaces, $this->opData['style'], $this->opData['output']['use'], $encodingStyle);

 		} else {

-			$this->responseSOAP = $this->serializeEnvelope($payload,$this->responseHeaders);

+			$this->responseSOAP = $this->serializeEnvelope($payload, $this->responseHeaders);

 		}

 		$this->debug("Leaving serialize_return");

 	}

@@ -763,18 +763,18 @@ 
 			// $this->outgoing_headers[] = "Status: 200 OK";

 		}

         // add debug data if in debug mode

-		if(isset($this->debug_flag) && $this->debug_flag){

+		if (isset($this->debug_flag) && $this->debug_flag) {

         	$payload .= $this->getDebugAsXMLComment();

         }

 		$this->outgoing_headers[] = "Server: $this->title Server v$this->version";

-		preg_match('/\$Revisio' . 'n: ([^ ]+)/', $this->revision, $rev);

+		preg_match('/\$Revisio'.'n: ([^ ]+)/', $this->revision, $rev);

 		$this->outgoing_headers[] = "X-SOAP-Server: $this->title/$this->version (".$rev[1].")";

 		// Let the Web server decide about this

 		//$this->outgoing_headers[] = "Connection: Close\r\n";

 		$payload = $this->getHTTPBody($payload);

 		$type = $this->getHTTPContentType();

 		$charset = $this->getHTTPContentTypeCharset();

-		$this->outgoing_headers[] = "Content-Type: $type" . ($charset ? '; charset=' . $charset : '');

+		$this->outgoing_headers[] = "Content-Type: $type".($charset ? '; charset='.$charset : '');

 		//begin code to compress payload - by John

 		// NOTE: there is no way to know whether the Web server will also compress

 		// this data.

@@ -811,11 +811,11 @@ 
 		//end code

 		$this->outgoing_headers[] = "Content-Length: ".strlen($payload);

 		reset($this->outgoing_headers);

-		foreach($this->outgoing_headers as $hdr){

+		foreach ($this->outgoing_headers as $hdr) {

 			header($hdr, false);

 		}

 		print $payload;

-		$this->response = join("\r\n",$this->outgoing_headers)."\r\n\r\n".$payload;

+		$this->response = join("\r\n", $this->outgoing_headers)."\r\n\r\n".$payload;

 	}

 

 	/**

@@ -827,12 +827,12 @@ 
 	* @return	boolean	Whether the operation was found

 	* @access   private

 	*/

-	function verify_method($operation,$request){

-		if(isset($this->wsdl) && is_object($this->wsdl)){

-			if($this->wsdl->getOperationData($operation)){

+	function verify_method($operation, $request) {

+		if (isset($this->wsdl) && is_object($this->wsdl)) {

+			if ($this->wsdl->getOperationData($operation)) {

 				return true;

 			}

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

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

 			return true;

 		}

 		return false;

@@ -847,7 +847,7 @@ 
 	* @access   private

 	*/

     function parseRequest($headers, $data) {

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

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

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

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

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

@@ -859,8 +859,8 @@ 
 		}

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

@@ -869,16 +869,16 @@ 
 			// 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');

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

 		// parse response, get soap parser obj

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

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

 

 		// parser debug

 		$this->debug("parser debug: \n".$parser->getDebug());

 		// if fault occurred during message parsing

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

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

 			$this->result = 'fault: error in msg parsing: '.$err;

-			$this->fault('SOAP-ENV:Client',"error in msg parsing:\n".$err);

+			$this->fault('SOAP-ENV:Client', "error in msg parsing:\n".$err);

 		// else successfully parsed request into soapval object

 		} else {

 			// get/set methodname

@@ -941,8 +941,8 @@ 
 	* @access   public

 	* @deprecated

 	*/

-	function add_to_map($methodname,$in,$out){

-			$this->operations[$methodname] = array('name' => $methodname,'in' => $in,'out' => $out);

+	function add_to_map($methodname, $in, $out) {

+			$this->operations[$methodname] = array('name' => $methodname, 'in' => $in, 'out' => $out);

 	}

 

 	/**

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

 	* @access   public

 	*/

-	function register($name,$in=array(),$out=array(),$namespace=false,$soapaction=false,$style=false,$use=false,$documentation='',$encodingStyle=''){

+	function register($name, $in = array(), $out = array(), $namespace = false, $soapaction = false, $style = false, $use = false, $documentation = '', $encodingStyle = '') {

 		global $HTTP_SERVER_VARS;

 

-		if($this->externalWSDLURL){

+		if ($this->externalWSDLURL) {

 			die('You cannot bind to an external WSDL file, and register methods outside of it! Please choose either WSDL or no WSDL.');

 		}

-		if (! $name) {

+		if (!$name) {

 			die('You must specify a name when you register an operation');

 		}

 		if (!is_array($in)) {

@@ -974,9 +974,9 @@ 
 		if (!is_array($out)) {

 			die('You must provide an array for operation outputs');

 		}

-		if(false == $namespace) {

+		if (false == $namespace) {

 		}

-		if(false == $soapaction) {

+		if (false == $soapaction) {

 			if (isset($_SERVER)) {

 				$SERVER_NAME = $_SERVER['SERVER_NAME'];

 				$SCRIPT_NAME = isset($_SERVER['PHP_SELF']) ? $_SERVER['PHP_SELF'] : $_SERVER['SCRIPT_NAME'];

@@ -995,10 +995,10 @@ 
         	}

 			$soapaction = "$SCHEME://$SERVER_NAME$SCRIPT_NAME/$name";

 		}

-		if(false == $style) {

+		if (false == $style) {

 			$style = "rpc";

 		}

-		if(false == $use) {

+		if (false == $use) {

 			$use = "encoded";

 		}

 		if ($use == 'encoded' && $encodingStyle == '') {

@@ -1012,8 +1012,8 @@ 
 	    'namespace' => $namespace,

 	    'soapaction' => $soapaction,

 	    'style' => $style);

-        if($this->wsdl){

-        	$this->wsdl->addOperation($name,$in,$out,$namespace,$soapaction,$style,$use,$documentation,$encodingStyle);

+        if ($this->wsdl) {

+        	$this->wsdl->addOperation($name, $in, $out, $namespace, $soapaction, $style, $use, $documentation, $encodingStyle);

 	    }

 		return true;

 	}

@@ -1028,11 +1028,11 @@ 
 	* @param	string $faultdetail

 	* @access   public

 	*/

-	function fault($faultcode,$faultstring,$faultactor='',$faultdetail=''){

+	function fault($faultcode, $faultstring, $faultactor = '', $faultdetail = '') {

 		if ($faultdetail == '' && $this->debug_flag) {

 			$faultdetail = $this->getDebug();

 		}

-		$this->fault = new nusoap_fault($faultcode,$faultactor,$faultstring,$faultdetail);

+		$this->fault = new nusoap_fault($faultcode, $faultactor, $faultstring, $faultdetail);

 		$this->fault->soap_defencoding = $this->soap_defencoding;

 	}

 

@@ -1047,7 +1047,7 @@ 
     * @param string $transport optional SOAP transport

     * @param mixed $schemaTargetNamespace optional 'types' targetNamespace for service schema or false

     */

-    function configureWSDL($serviceName,$namespace = false,$endpoint = false,$style='rpc', $transport = 'http://schemas.xmlsoap.org/soap/http', $schemaTargetNamespace = false)

+    function configureWSDL($serviceName, $namespace = false, $endpoint = false, $style = 'rpc', $transport = 'http://schemas.xmlsoap.org/soap/http', $schemaTargetNamespace = false)

     {

     	global $HTTP_SERVER_VARS;

 

@@ -1065,20 +1065,20 @@ 
 			$this->setError("Neither _SERVER nor HTTP_SERVER_VARS is available");

 		}

 		// If server name has port number attached then strip it (else port number gets duplicated in WSDL output) (occurred using lighttpd and FastCGI)

-		$colon = strpos($SERVER_NAME,":");

+		$colon = strpos($SERVER_NAME, ":");

 		if ($colon) {

 		    $SERVER_NAME = substr($SERVER_NAME, 0, $colon);

 		}

 		if ($SERVER_PORT == 80) {

 			$SERVER_PORT = '';

 		} else {

-			$SERVER_PORT = ':' . $SERVER_PORT;

+			$SERVER_PORT = ':'.$SERVER_PORT;

 		}

-        if(false == $namespace) {

+        if (false == $namespace) {

             $namespace = "http://$SERVER_NAME/soap/$serviceName";

         }

 

-        if(false == $endpoint) {

+        if (false == $endpoint) {

         	if ($HTTPS == '1' || $HTTPS == 'on') {

         		$SCHEME = 'https';

         	} else {

@@ -1087,7 +1087,7 @@ 
             $endpoint = "$SCHEME://$SERVER_NAME$SERVER_PORT$SCRIPT_NAME";

         }

 

-        if(false == $schemaTargetNamespace) {

+        if (false == $schemaTargetNamespace) {

             $schemaTargetNamespace = $namespace;

         }

 

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

Spacing +3 added lines, -3 removed lines

@@ -45,7 +45,7 @@ 
     * @param string $faultstring human readable error message

     * @param mixed $faultdetail detail, typically a string or array of string

 	*/

-	function nusoap_fault($faultcode,$faultactor='',$faultstring='',$faultdetail=''){

+	function nusoap_fault($faultcode, $faultactor = '', $faultstring = '', $faultdetail = '') {

 		parent::nusoap_base();

 		$this->faultcode = $faultcode;

 		$this->faultactor = $faultactor;

@@ -59,9 +59,9 @@ 
 	* @return	string	The serialization of the fault instance.

 	* @access   public

 	*/

-	function serialize(){

+	function serialize() {

 		$ns_string = '';

-		foreach($this->namespaces as $k => $v){

+		foreach ($this->namespaces as $k => $v) {

 			$ns_string .= "\n  xmlns:$k=\"$v\"";

 		}

 		$return_msg =