chamilo / chamilo-lms

main/gradebook/lib/fe/resulttable.class.php

Indentation +1 added lines, -1 removed lines

@@ -113,7 +113,7 @@
         foreach ($data_array as $item) {
             $row = array ();
             if ($this->iscourse == '1') {
-                 $row[] = $item['result_id'];
+                    $row[] = $item['result_id'];
             }
             if ($is_western_name_order) {
                 $row[] = $item['firstname'];

main/group/group_category.php

Indentation +10 added lines, -10 removed lines

@@ -18,7 +18,7 @@ 
     isset ($_GET['action']) ||
     isset ($_POST['action']))
 ) {
-	api_not_allowed();
+    api_not_allowed();
 }
 
 /**
@@ -86,30 +86,30 @@ 
 
 // Build the form
 if (isset($_GET['id'])) {
-	// Update settings of existing category
-	$action = 'update_settings';
+    // Update settings of existing category
+    $action = 'update_settings';
     $form = new FormValidator(
         'group_category',
         'post',
         api_get_self().'?id='.$category['id'].'&'.api_get_cidreq()
     );
-	$form->addElement('hidden', 'id');
+    $form->addElement('hidden', 'id');
 } else {
     // Checks if the field was created in the table Category. It creates it if is neccesary
     $table_category = Database :: get_course_table(TABLE_GROUP_CATEGORY);
     if (!Database::query("SELECT wiki_state FROM $table_category WHERE c_id = $course_id")) {
         Database::query("ALTER TABLE $table_category ADD wiki_state tinyint(3) UNSIGNED NOT NULL default '1' WHERE c_id = $course_id");
     }
-	// Create a new category
-	$action = 'add_category';
-	$form = new FormValidator('group_category');
+    // Create a new category
+    $action = 'add_category';
+    $form = new FormValidator('group_category');
 }
 
 // If categories allowed, show title & description field
 if (api_get_setting('allow_group_categories') == 'true') {
     $form->addElement('header', $nameTools);
     $form->addElement('html', '<div class="row"><div class="col-md-6">');
-	$form->addText('title', get_lang('Title'));
+    $form->addText('title', get_lang('Title'));
 
     // Groups per user
     $possible_values = array();
@@ -142,8 +142,8 @@ 
     $form->addElement('html', '</div>');
     $form->addElement('html', '</div>');
 } else {
-	$form->addElement('hidden', 'title');
-	$form->addElement('hidden', 'description');
+    $form->addElement('hidden', 'title');
+    $form->addElement('hidden', 'description');
 }
 
 $form->addElement('header', get_lang('DefaultSettingsForNewGroups'));

main/group/group_creation.php

Indentation +16 added lines, -16 removed lines

@@ -79,10 +79,10 @@ 
 if (isset($_POST['number_of_groups'])) {
     if (!is_numeric($_POST['number_of_groups']) || intval($_POST['number_of_groups']) < 1) {
         Display :: display_error_message(
-			get_lang('PleaseEnterValidNumber').'<br /><br />
+            get_lang('PleaseEnterValidNumber').'<br /><br />
 			<a href="group_creation.php?'.api_get_cidreq().'">&laquo; '.get_lang('Back').'</a>',
-			false
-		);
+            false
+        );
     } else {
         $number_of_groups = intval($_POST['number_of_groups']);
         if ($number_of_groups > 1) {
@@ -120,20 +120,20 @@ 
     }
     </script>
     <?php
-		}
-		$group_categories = GroupManager::get_categories();
-		$group_id = GroupManager :: get_number_of_groups() + 1;
-		$cat_options = [];
-		foreach ($group_categories as $index => $category) {
-			$cat_options[$category['id']] = $category['title'];
-		}
+        }
+        $group_categories = GroupManager::get_categories();
+        $group_id = GroupManager :: get_number_of_groups() + 1;
+        $cat_options = [];
+        foreach ($group_categories as $index => $category) {
+            $cat_options[$category['id']] = $category['title'];
+        }
         $form = new FormValidator('create_groups_step2', 'POST', api_get_self().'?'.api_get_cidreq());
 
-		// Modify the default templates
-		$renderer = $form->defaultRenderer();
-		$form_template = "<form {attributes}>\n<div class='create-groups'>\n<table>\n{content}\n</table>\n</div>\n</form>";
-		$renderer->setFormTemplate($form_template);
-		$element_template = <<<EOT
+        // Modify the default templates
+        $renderer = $form->defaultRenderer();
+        $form_template = "<form {attributes}>\n<div class='create-groups'>\n<table>\n{content}\n</table>\n</div>\n</form>";
+        $renderer->setFormTemplate($form_template);
+        $element_template = <<<EOT
         <tr class="separate">
 		<td>
 			<!-- BEGIN required -->
@@ -225,7 +225,7 @@ 
         $form->setDefaults($defaults);
         $form->addButtonCreate(get_lang('CreateGroup'), 'submit');
         $form->display();
-	}
+    }
 } else {
     /*
      * Show form to generate new groups

main/inc/ajax/course.ajax.php

Indentation +5 added lines, -5 removed lines

@@ -267,11 +267,11 @@
                 $coachName = api_get_person_name($userResult['firstname'], $userResult['lastname']);
             }
 
-           $courses[] = array(
-               'id' => $courseId,
-               'name' => $course['title'],
-               'coachName' => $coachName,
-           );
+            $courses[] = array(
+                'id' => $courseId,
+                'name' => $course['title'],
+                'coachName' => $coachName,
+            );
         }
 
         echo json_encode($courses);

main/session/add_users_to_session.php

Indentation +37 added lines, -37 removed lines

@@ -38,7 +38,7 @@ 
 $add_type = 'unique';
 
 if (isset($_REQUEST['add_type']) && $_REQUEST['add_type'] != '') {
-	$add_type = Security::remove_XSS($_REQUEST['add_type']);
+    $add_type = Security::remove_XSS($_REQUEST['add_type']);
 }
 
 $page = isset($_GET['page']) ? Security::remove_XSS($_GET['page']) : null;
@@ -426,8 +426,8 @@ 
 
     if ($use_extra_fields) {
         $final_result = array();
-       	if (count($extra_field_result)>1) {
-	    for($i=0;$i<count($extra_field_result)-1;$i++) {
+            if (count($extra_field_result)>1) {
+        for($i=0;$i<count($extra_field_result)-1;$i++) {
                 if (is_array($extra_field_result[$i+1])) {
                     $final_result  = array_intersect($extra_field_result[$i],$extra_field_result[$i+1]);
                 }
@@ -547,12 +547,12 @@ 
 }
 
 if ($add_type == 'multiple') {
-	$link_add_type_unique = '<a href="'.api_get_self().'?id_session='.$id_session.'&add='.$addProcess.'&add_type=unique">'.
+    $link_add_type_unique = '<a href="'.api_get_self().'?id_session='.$id_session.'&add='.$addProcess.'&add_type=unique">'.
         Display::return_icon('single.gif').get_lang('SessionAddTypeUnique').'</a>';
-	$link_add_type_multiple = Display::url(Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple'), '');
+    $link_add_type_multiple = Display::url(Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple'), '');
 } else {
-	$link_add_type_unique = Display::url(Display::return_icon('single.gif').get_lang('SessionAddTypeUnique'), '');
-	$link_add_type_multiple = '<a href="'.api_get_self().'?id_session='.$id_session.'&amp;add='.$addProcess.'&amp;add_type=multiple">'.Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple').'</a>';
+    $link_add_type_unique = Display::url(Display::return_icon('single.gif').get_lang('SessionAddTypeUnique'), '');
+    $link_add_type_multiple = '<a href="'.api_get_self().'?id_session='.$id_session.'&amp;add='.$addProcess.'&amp;add_type=multiple">'.Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple').'</a>';
 }
 $link_add_group = Display::url(
     Display::return_icon('multiple.gif',get_lang('RegistrationByUsersGroups')).get_lang('RegistrationByUsersGroups'),
@@ -580,17 +580,17 @@ 
 <?php echo '<legend>'.$tool_name.' ('.$session_info['name'].') </legend>'; ?>
 <?php
 if ($add_type=='multiple') {
-	if (is_array($extra_field_list)) {
-		if (is_array($new_field_list) && count($new_field_list)>0 ) {
-			echo '<h3>'.get_lang('FilterUsers').'</h3>';
-			foreach ($new_field_list as $new_field) {
-				echo $new_field['name'];
-				$varname = 'field_'.$new_field['variable'];
+    if (is_array($extra_field_list)) {
+        if (is_array($new_field_list) && count($new_field_list)>0 ) {
+            echo '<h3>'.get_lang('FilterUsers').'</h3>';
+            foreach ($new_field_list as $new_field) {
+                echo $new_field['name'];
+                $varname = 'field_'.$new_field['variable'];
                 $fieldtype = $new_field['type'];
-				echo '&nbsp;<select name="'.$varname.'">';
-				echo '<option value="0">--'.get_lang('Select').'--</option>';
-				foreach	($new_field['data'] as $option) {
-					$checked='';
+                echo '&nbsp;<select name="'.$varname.'">';
+                echo '<option value="0">--'.get_lang('Select').'--</option>';
+                foreach	($new_field['data'] as $option) {
+                    $checked='';
                     if ($fieldtype == ExtraField::FIELD_TYPE_TAG) {
                         if (isset($_POST[$varname])) {
                             if ($_POST[$varname] == $option['tag']) {
@@ -611,11 +611,11 @@ 
                 $extraHidden = $fieldtype == ExtraField::FIELD_TYPE_TAG ? '<input type="hidden" name="field_id" value="'.$option['field_id'].'" />' : '';
                 echo $extraHidden;
                 echo '&nbsp;&nbsp;';
-			}
-			echo '<input type="button" value="'.get_lang('Filter').'" onclick="validate_filter()" />';
-			echo '<br /><br />';
-		}
-	}
+            }
+            echo '<input type="button" value="'.get_lang('Filter').'" onclick="validate_filter()" />';
+            echo '<br /><br />';
+        }
+    }
 }
 ?>
 <input type="hidden" name="form_sent" value="1" />
@@ -623,7 +623,7 @@ 
 
 <?php
 if (!empty($errorMsg)) {
-	Display::display_normal_message($errorMsg); //main API
+    Display::display_normal_message($errorMsg); //main API
 }
 ?>
 <div id="multiple-add-session" class="row">
@@ -632,7 +632,7 @@ 
             <label><?php echo get_lang('UserListInPlatform') ?> </label>
             <?php
             if (!($add_type=='multiple')) {
-              ?>
+                ?>
               <input type="text" id="user_to_add" onkeyup="xajax_search_users(this.value,'single')" class="form-control" />
               <div id="ajax_list_users_single" class="select-list-ajax"></div>
               <?php
@@ -641,21 +641,21 @@ 
             <div id="ajax_list_users_multiple">
             <select id="origin_users" name="nosessionUsersList[]" multiple="multiple" size="15" class="form-control">
               <?php
-              foreach ($nosessionUsersList as $uid => $enreg) {
-              ?>
+                foreach ($nosessionUsersList as $uid => $enreg) {
+                ?>
                   <option value="<?php echo $uid; ?>" <?php if(in_array($uid,$UserList)) echo 'selected="selected"'; ?>>
                       <?php
-                      $personName = api_get_person_name($enreg['fn'], $enreg['ln']).' ('.$enreg['un'].') '.$enreg['official_code'];
-                      if ($showOfficialCode) {
-                          $officialCode = !empty($enreg['official_code']) ? $enreg['official_code'].' - ' : '? - ';
-                          $personName = $officialCode.api_get_person_name($enreg['fn'], $enreg['ln']).' ('.$enreg['un'].')';
-                      }
-                      echo $personName;
-                      ?>
+                        $personName = api_get_person_name($enreg['fn'], $enreg['ln']).' ('.$enreg['un'].') '.$enreg['official_code'];
+                        if ($showOfficialCode) {
+                            $officialCode = !empty($enreg['official_code']) ? $enreg['official_code'].' - ' : '? - ';
+                            $personName = $officialCode.api_get_person_name($enreg['fn'], $enreg['ln']).' ('.$enreg['un'].')';
+                        }
+                        echo $personName;
+                        ?>
                   </option>
               <?php
-              }
-              ?>
+                }
+                ?>
             </select>
             </div>
                 <input type="checkbox" onchange="checked_in_no_session(this.checked);" name="user_with_any_session" id="user_with_any_session_id">
@@ -663,7 +663,7 @@ 
             <?php
             }
             unset($nosessionUsersList);
-           ?>
+            ?>
         </div>
     </div>
 
@@ -707,7 +707,7 @@ 
               <?php
             }
             if (!empty($addProcess)) {
-		echo '<button class="btn btn-success" type="button" value="" onclick="valide()" >'.get_lang('FinishSessionCreation').'</button>';
+        echo '<button class="btn btn-success" type="button" value="" onclick="valide()" >'.get_lang('FinishSessionCreation').'</button>';
             } else {
                 echo '<button class="btn btn-success" type="button" value="" onclick="valide()" >'.get_lang('SubscribeUsersToSession').'</button>';
             }

main/admin/dashboard_add_users_to_user.php

Indentation +15 added lines, -15 removed lines

@@ -55,7 +55,7 @@ 
 
 $add_type = 'multiple';
 if (isset($_GET['add_type']) && $_GET['add_type']!='') {
-	$add_type = Security::remove_XSS($_REQUEST['add_type']);
+    $add_type = Security::remove_XSS($_REQUEST['add_type']);
 }
 
 if (!api_is_platform_admin()) {
@@ -160,7 +160,7 @@ 
                     $return .= '...<br />';
                 }
             }
-           $xajax_response->addAssign('ajax_list_users_single','innerHTML',api_utf8_encode($return));
+            $xajax_response->addAssign('ajax_list_users_single','innerHTML',api_utf8_encode($return));
         } else {
             $return .= '<select id="origin" class="form-control" name="NoAssignedUsersList[]" multiple="multiple" size="15" ">';
             while($user = Database :: fetch_array($rs)) {
@@ -172,7 +172,7 @@ 
         }
     }
 
-	return $xajax_response;
+    return $xajax_response;
 }
 
 $xajax->processRequests();
@@ -359,13 +359,13 @@ 
 $assigned_users_id = array_keys($assigned_users_to_hrm);
 $without_assigned_users = '';
 if (count($assigned_users_id) > 0) {
-	$without_assigned_users = " user.user_id NOT IN(".implode(',',$assigned_users_id).") AND ";
+    $without_assigned_users = " user.user_id NOT IN(".implode(',',$assigned_users_id).") AND ";
 }
 
 $search_user = '';
 if (!empty($firstLetterUser)) {
-	$needle = Database::escape_string($firstLetterUser);
-	$search_user ="AND ".(api_sort_by_first_name() ? 'firstname' : 'lastname')." LIKE '$needle%'";
+    $needle = Database::escape_string($firstLetterUser);
+    $search_user ="AND ".(api_sort_by_first_name() ? 'firstname' : 'lastname')." LIKE '$needle%'";
 }
 
 $sqlConditions = null;
@@ -385,7 +385,7 @@ 
 }
 
 if (api_is_multiple_url_enabled()) {
-	$sql = "SELECT user.user_id, username, lastname, firstname
+    $sql = "SELECT user.user_id, username, lastname, firstname
 	        FROM $tbl_user user  LEFT JOIN $tbl_access_url_rel_user au 
 	        ON (au.user_id = user.user_id)
 			WHERE
@@ -396,7 +396,7 @@ 
                 $sqlConditions
             ORDER BY firstname";
 } else {
-	$sql = "SELECT user_id, username, lastname, firstname
+    $sql = "SELECT user_id, username, lastname, firstname
 	        FROM $tbl_user user
 			WHERE
 			    $without_assigned_users
@@ -412,7 +412,7 @@ 
 <input type="hidden" name="formSent" value="1" />
 <?php
 if(!empty($msg)) {
-	Display::display_normal_message($msg); //main API
+    Display::display_normal_message($msg); //main API
 }
 ?>
 
@@ -465,26 +465,26 @@ 
                 </button>
             </div>
           <?php
-          }
-          ?>
+            }
+            ?>
             <div class="separate-action">
                 <?php
-		echo '<button class="btn btn-success" type="button" value="" onclick="valide()" >'.$tool_name.'</button>';
+        echo '<button class="btn btn-success" type="button" value="" onclick="valide()" >'.$tool_name.'</button>';
             ?>
             </div>
         </div>
     </div>
     <div class="col-md-4">
         <?php
-	if (UserManager::is_admin($user_id)) {
-		echo get_lang('AssignedUsersListToPlatformAdministrator');
+    if (UserManager::is_admin($user_id)) {
+        echo get_lang('AssignedUsersListToPlatformAdministrator');
             } else if ($user_info['status'] == SESSIONADMIN) {
                     echo get_lang('AssignedUsersListToSessionsAdministrator');
             } else if ($user_info['status'] == STUDENT_BOSS) {
                     echo get_lang('AssignedUsersListToStudentBoss');
             } else {
                     echo get_lang('AssignedUsersListToHumanResourcesManager');
-	}
+    }
         ?>
         <div class="form-group">
             <div class="col-sm-12">

main/session/session_edit.php

Indentation +6 added lines, -6 removed lines

@@ -60,7 +60,7 @@ 
 $interbreadcrumb[] = array('url' => "resume_session.php?id_session=".$id,"name" => get_lang('SessionOverview'));
 
 if (isset($_POST['formSent']) && $_POST['formSent']) {
-	$formSent = 1;
+    $formSent = 1;
 }
 
 $order_clause = 'ORDER BY ';
@@ -71,15 +71,15 @@ 
         WHERE status='1'".$order_clause;
 
 if (api_is_multiple_url_enabled()) {
-	$table_access_url_rel_user= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
-	$access_url_id = api_get_current_access_url_id();
-	if ($access_url_id != -1) {
-		$sql = "SELECT DISTINCT u.user_id,lastname,firstname,username
+    $table_access_url_rel_user= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+    $access_url_id = api_get_current_access_url_id();
+    if ($access_url_id != -1) {
+        $sql = "SELECT DISTINCT u.user_id,lastname,firstname,username
 		        FROM $tbl_user u
                 INNER JOIN $table_access_url_rel_user url_rel_user
                 ON (url_rel_user.user_id = u.user_id)
 			    WHERE status='1' AND access_url_id = '$access_url_id' $order_clause";
-	}
+    }
 }
 
 $result = Database::query($sql);

plugin/dashboard/block_session/block_session.class.php

Indentation +72 added lines, -72 removed lines

@@ -15,36 +15,36 @@ 
 class BlockSession extends Block
 {
     private $user_id;
-	private $sessions;
-	private $path;
-	private $permission = array(DRH, SESSIONADMIN);
+    private $sessions;
+    private $path;
+    private $permission = array(DRH, SESSIONADMIN);
 
-	/**
-	 * Constructor
-	 */
+    /**
+     * Constructor
+     */
     public function __construct ($user_id)
     {
-    	$this->user_id 	= $user_id;
-    	$this->path = 'block_session';
-    	if ($this->is_block_visible_for_user($user_id)) {
+        $this->user_id 	= $user_id;
+        $this->path = 'block_session';
+        if ($this->is_block_visible_for_user($user_id)) {
             $this->sessions = SessionManager::get_sessions_followed_by_drh($user_id);
-    	}
+        }
     }
 
-	/**
-	 * This method check if a user is allowed to see the block inside dashboard interface
-	 * @param	int		User id
-	 * @return	bool	Is block visible for user
-	 */
+    /**
+     * This method check if a user is allowed to see the block inside dashboard interface
+     * @param	int		User id
+     * @return	bool	Is block visible for user
+     */
     public function is_block_visible_for_user($user_id)
     {
-    	$user_info = api_get_user_info($user_id);
-		$user_status = $user_info['status'];
-		$is_block_visible_for_user = false;
-    	if (UserManager::is_admin($user_id) || in_array($user_status, $this->permission)) {
-    		$is_block_visible_for_user = true;
-    	}
-    	return $is_block_visible_for_user;
+        $user_info = api_get_user_info($user_id);
+        $user_status = $user_info['status'];
+        $is_block_visible_for_user = false;
+        if (UserManager::is_admin($user_id) || in_array($user_status, $this->permission)) {
+            $is_block_visible_for_user = true;
+        }
+        return $is_block_visible_for_user;
     }
 
     /**
@@ -55,14 +55,14 @@ 
     public function get_block()
     {
 
-		global $charset;
+        global $charset;
 
-    	$column = 2;
-    	$data   = array();
+        $column = 2;
+        $data   = array();
 
-		$content = $this->get_content_html();
+        $content = $this->get_content_html();
 
-		$content_html = '
+        $content_html = '
 			            <div class="panel panel-default" id="intro">
 			                <div class="panel-heading">
 			                    '.get_lang('SessionsInformation').'
@@ -76,40 +76,40 @@ 
 			            </div>
 				';
 
-    	$data['column'] = $column;
-    	$data['content_html'] = $content_html;
+        $data['column'] = $column;
+        $data['content_html'] = $content_html;
 
-    	return $data;
+        return $data;
     }
 
     /**
- 	 * This method return a content html, it's used inside get_block method for showing it inside dashboard interface
- 	 * @return string  content html
- 	 */
+     * This method return a content html, it's used inside get_block method for showing it inside dashboard interface
+     * @return string  content html
+     */
     public function get_content_html()
     {
 
- 		$content = '';
-		$sessions = $this->sessions;
+            $content = '';
+        $sessions = $this->sessions;
 
-		//$content = '<div style="margin:10px;">';
-		$content .= '<h4>'.get_lang('YourSessionsList').'</h4>';
+        //$content = '<div style="margin:10px;">';
+        $content .= '<h4>'.get_lang('YourSessionsList').'</h4>';
 
-		if (count($sessions) > 0) {
-			$sessions_table = '<table class="data_table" width:"95%">';
- 			$sessions_table .= '<tr>
+        if (count($sessions) > 0) {
+            $sessions_table = '<table class="data_table" width:"95%">';
+                $sessions_table .= '<tr>
 									<th >'.get_lang('Title').'</th>
 									<th >'.get_lang('Date').'</th>
 									<th width="100px">'.get_lang('NbCoursesPerSession').'</th>
 								</tr>';
-			$i = 1;
-			foreach ($sessions as $session) {
+            $i = 1;
+            foreach ($sessions as $session) {
 
-				$session_id = intval($session['id']);
-				$title = $session['name'];
+                $session_id = intval($session['id']);
+                $title = $session['name'];
 
-				if (!empty($session['access_start_date'])) {
-				    $dateFrom = api_convert_and_format_date(
+                if (!empty($session['access_start_date'])) {
+                    $dateFrom = api_convert_and_format_date(
                         $session['access_start_date'],
                         DATE_FORMAT_SHORT,
                         date_default_timezone_get()
@@ -121,44 +121,44 @@ 
                     );
 
                     $date = vsprintf(get_lang('FromDateXToDateY'), [$dateFrom, $dateUntil]);
-				} else {
-					$date = ' - ';
-				}
+                } else {
+                    $date = ' - ';
+                }
 
-	 			$count_courses_in_session = count(Tracking::get_courses_list_from_session($session_id));
+                    $count_courses_in_session = count(Tracking::get_courses_list_from_session($session_id));
 
-				if ($i%2 == 0) $class_tr = 'row_odd';
-	    		else $class_tr = 'row_even';
+                if ($i%2 == 0) $class_tr = 'row_odd';
+                else $class_tr = 'row_even';
 
-				$sessions_table .= '<tr class="'.$class_tr.'">
+                $sessions_table .= '<tr class="'.$class_tr.'">
 										<td>'.$title.'</td>
 										<td align="center">'.$date.'</td>
 										<td align="center">'.$count_courses_in_session.'</td>
 								   </tr>';
-				$i++;
-			}
-			$sessions_table .= '</table>';
-			$content .= $sessions_table;
-		} else {
-			$content .= get_lang('ThereIsNoInformationAboutYourSessions');
-		}
+                $i++;
+            }
+            $sessions_table .= '</table>';
+            $content .= $sessions_table;
+        } else {
+            $content .= get_lang('ThereIsNoInformationAboutYourSessions');
+        }
 
-		if (count($sessions) > 0) {
-			$content .= '<div style="text-align:right;margin-top:10px;"><a href="'.api_get_path(WEB_CODE_PATH).'mySpace/session.php">'.get_lang('SeeMore').'</a></div>';
-		}
+        if (count($sessions) > 0) {
+            $content .= '<div style="text-align:right;margin-top:10px;"><a href="'.api_get_path(WEB_CODE_PATH).'mySpace/session.php">'.get_lang('SeeMore').'</a></div>';
+        }
 
-		//$content .= '</div>';
+        //$content .= '</div>';
 
- 		return $content;
- 	}
+            return $content;
+        }
 
     /**
-	 * Get number of sessions
-	 * @return int
-	 */
-	function get_number_of_sessions()
+     * Get number of sessions
+     * @return int
+     */
+    function get_number_of_sessions()
     {
-		return count($this->sessions);
-	}
+        return count($this->sessions);
+    }
 
 }

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

Indentation +1576 added lines, -1576 removed lines

@@ -11,7 +11,7 @@ 
 */

 class wsdl extends nusoap_base

 {

-	// URL or filename of the root of this WSDL

+    // URL or filename of the root of this WSDL

     var $wsdl;

     // define internal arrays of bindings, ports, operations, messages, etc.

     var $schemas = array();

@@ -38,142 +38,142 @@ 
     var $position = 0;

     var $depth = 0;

     var $depth_array = array();

-	// for getting wsdl

-	var $proxyhost = '';

+    // for getting wsdl

+    var $proxyhost = '';

     var $proxyport = '';

-	var $proxyusername = '';

-	var $proxypassword = '';

-	var $timeout = 0;

-	var $response_timeout = 30;

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

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

-	// for HTTP authentication

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

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

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

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

+    var $proxyusername = '';

+    var $proxypassword = '';

+    var $timeout = 0;

+    var $response_timeout = 30;

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

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

+    // for HTTP authentication

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

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

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

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

 

     /**

      * constructor

      *

      * @param string $wsdl WSDL document URL

-	 * @param string $proxyhost

-	 * @param string $proxyport

-	 * @param string $proxyusername

-	 * @param string $proxypassword

-	 * @param integer $timeout set the connection timeout

-	 * @param integer $response_timeout set the response timeout

-	 * @param array $curl_options user-specified cURL options

-	 * @param boolean $use_curl try to use cURL

+     * @param string $proxyhost

+     * @param string $proxyport

+     * @param string $proxyusername

+     * @param string $proxypassword

+     * @param integer $timeout set the connection timeout

+     * @param integer $response_timeout set the response timeout

+     * @param array $curl_options user-specified cURL options

+     * @param boolean $use_curl try to use cURL

      * @access public

      */

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

-		parent::__construct();

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

+        parent::__construct();

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

         $this->proxyhost = $proxyhost;

         $this->proxyport = $proxyport;

-		$this->proxyusername = $proxyusername;

-		$this->proxypassword = $proxypassword;

-		$this->timeout = $timeout;

-		$this->response_timeout = $response_timeout;

-		if (is_array($curl_options))

-			$this->curl_options = $curl_options;

-		$this->use_curl = $use_curl;

-		$this->fetchWSDL($wsdl);

+        $this->proxyusername = $proxyusername;

+        $this->proxypassword = $proxypassword;

+        $this->timeout = $timeout;

+        $this->response_timeout = $response_timeout;

+        if (is_array($curl_options))

+            $this->curl_options = $curl_options;

+        $this->use_curl = $use_curl;

+        $this->fetchWSDL($wsdl);

     }

 

-	/**

-	 * fetches the WSDL document and parses it

-	 *

-	 * @access public

-	 */

-	function fetchWSDL($wsdl) {

-		$this->debug("parse and process WSDL path=$wsdl");

-		$this->wsdl = $wsdl;

+    /**

+     * fetches the WSDL document and parses it

+     *

+     * @access public

+     */

+    function fetchWSDL($wsdl) {

+        $this->debug("parse and process WSDL path=$wsdl");

+        $this->wsdl = $wsdl;

         // parse wsdl file

         if ($this->wsdl != "") {

             $this->parseWSDL($this->wsdl);

         }

         // imports

         // TODO: handle imports more properly, grabbing them in-line and nesting them

-    	$imported_urls = array();

-    	$imported = 1;

-    	while ($imported > 0) {

-    		$imported = 0;

-    		// Schema imports

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

-    			foreach ($list as $xs) {

-					$wsdlparts = parse_url($this->wsdl);	// this is bogusly simple!

-		            foreach ($xs->imports as $ns2 => $list2) {

-		                for ($ii = 0; $ii < count($list2); $ii++) {

-		                	if (! $list2[$ii]['loaded']) {

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

-		                		$url = $list2[$ii]['location'];

-								if ($url != '') {

-									$urlparts = parse_url($url);

-									if (!isset($urlparts['host'])) {

-										$url = $wsdlparts['scheme'] . '://' . $wsdlparts['host'] . (isset($wsdlparts['port']) ? ':' .$wsdlparts['port'] : '') .

-												substr($wsdlparts['path'],0,strrpos($wsdlparts['path'],'/') + 1) .$urlparts['path'];

-									}

-									if (! in_array($url, $imported_urls)) {

-					                	$this->parseWSDL($url);

-				                		$imported++;

-				                		$imported_urls[] = $url;

-				                	}

-								} else {

-									$this->debug("Unexpected scenario: empty URL for unloaded import");

-								}

-							}

-						}

-		            }

-    			}

-    		}

-    		// WSDL imports

-			$wsdlparts = parse_url($this->wsdl);	// this is bogusly simple!

+        $imported_urls = array();

+        $imported = 1;

+        while ($imported > 0) {

+            $imported = 0;

+            // Schema imports

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

+                foreach ($list as $xs) {

+                    $wsdlparts = parse_url($this->wsdl);	// this is bogusly simple!

+                    foreach ($xs->imports as $ns2 => $list2) {

+                        for ($ii = 0; $ii < count($list2); $ii++) {

+                            if (! $list2[$ii]['loaded']) {

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

+                                $url = $list2[$ii]['location'];

+                                if ($url != '') {

+                                    $urlparts = parse_url($url);

+                                    if (!isset($urlparts['host'])) {

+                                        $url = $wsdlparts['scheme'] . '://' . $wsdlparts['host'] . (isset($wsdlparts['port']) ? ':' .$wsdlparts['port'] : '') .

+                                                substr($wsdlparts['path'],0,strrpos($wsdlparts['path'],'/') + 1) .$urlparts['path'];

+                                    }

+                                    if (! in_array($url, $imported_urls)) {

+                                        $this->parseWSDL($url);

+                                        $imported++;

+                                        $imported_urls[] = $url;

+                                    }

+                                } else {

+                                    $this->debug("Unexpected scenario: empty URL for unloaded import");

+                                }

+                            }

+                        }

+                    }

+                }

+            }

+            // WSDL imports

+            $wsdlparts = parse_url($this->wsdl);	// this is bogusly simple!

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

                 for ($ii = 0; $ii < count($list); $ii++) {

-                	if (! $list[$ii]['loaded']) {

-                		$this->import[$ns][$ii]['loaded'] = true;

-                		$url = $list[$ii]['location'];

-						if ($url != '') {

-							$urlparts = parse_url($url);

-							if (!isset($urlparts['host'])) {

-								$url = $wsdlparts['scheme'] . '://' . $wsdlparts['host'] . (isset($wsdlparts['port']) ? ':' . $wsdlparts['port'] : '') .

-										substr($wsdlparts['path'],0,strrpos($wsdlparts['path'],'/') + 1) .$urlparts['path'];

-							}

-							if (! in_array($url, $imported_urls)) {

-			                	$this->parseWSDL($url);

-		                		$imported++;

-		                		$imported_urls[] = $url;

-		                	}

-						} else {

-							$this->debug("Unexpected scenario: empty URL for unloaded import");

-						}

-					}

-				}

+                    if (! $list[$ii]['loaded']) {

+                        $this->import[$ns][$ii]['loaded'] = true;

+                        $url = $list[$ii]['location'];

+                        if ($url != '') {

+                            $urlparts = parse_url($url);

+                            if (!isset($urlparts['host'])) {

+                                $url = $wsdlparts['scheme'] . '://' . $wsdlparts['host'] . (isset($wsdlparts['port']) ? ':' . $wsdlparts['port'] : '') .

+                                        substr($wsdlparts['path'],0,strrpos($wsdlparts['path'],'/') + 1) .$urlparts['path'];

+                            }

+                            if (! in_array($url, $imported_urls)) {

+                                $this->parseWSDL($url);

+                                $imported++;

+                                $imported_urls[] = $url;

+                            }

+                        } else {

+                            $this->debug("Unexpected scenario: empty URL for unloaded import");

+                        }

+                    }

+                }

             }

-		}

+        }

         // add new data to operation data

         foreach($this->bindings as $binding => $bindingData) {

             if (isset($bindingData['operations']) && is_array($bindingData['operations'])) {

                 foreach($bindingData['operations'] as $operation => $data) {

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

                     $this->bindings[$binding]['operations'][$operation]['input'] =

-						isset($this->bindings[$binding]['operations'][$operation]['input']) ?

-						array_merge($this->bindings[$binding]['operations'][$operation]['input'], $this->portTypes[ $bindingData['portType'] ][$operation]['input']) :

-						$this->portTypes[ $bindingData['portType'] ][$operation]['input'];

+                        isset($this->bindings[$binding]['operations'][$operation]['input']) ?

+                        array_merge($this->bindings[$binding]['operations'][$operation]['input'], $this->portTypes[ $bindingData['portType'] ][$operation]['input']) :

+                        $this->portTypes[ $bindingData['portType'] ][$operation]['input'];

                     $this->bindings[$binding]['operations'][$operation]['output'] =

-						isset($this->bindings[$binding]['operations'][$operation]['output']) ?

-						array_merge($this->bindings[$binding]['operations'][$operation]['output'], $this->portTypes[ $bindingData['portType'] ][$operation]['output']) :

-						$this->portTypes[ $bindingData['portType'] ][$operation]['output'];

+                        isset($this->bindings[$binding]['operations'][$operation]['output']) ?

+                        array_merge($this->bindings[$binding]['operations'][$operation]['output'], $this->portTypes[ $bindingData['portType'] ][$operation]['output']) :

+                        $this->portTypes[ $bindingData['portType'] ][$operation]['output'];

                     if(isset($this->messages[ $this->bindings[$binding]['operations'][$operation]['input']['message'] ])){

-						$this->bindings[$binding]['operations'][$operation]['input']['parts'] = $this->messages[ $this->bindings[$binding]['operations'][$operation]['input']['message'] ];

-					}

-					if(isset($this->messages[ $this->bindings[$binding]['operations'][$operation]['output']['message'] ])){

-                   		$this->bindings[$binding]['operations'][$operation]['output']['parts'] = $this->messages[ $this->bindings[$binding]['operations'][$operation]['output']['message'] ];

+                        $this->bindings[$binding]['operations'][$operation]['input']['parts'] = $this->messages[ $this->bindings[$binding]['operations'][$operation]['input']['message'] ];

+                    }

+                    if(isset($this->messages[ $this->bindings[$binding]['operations'][$operation]['output']['message'] ])){

+                            $this->bindings[$binding]['operations'][$operation]['output']['parts'] = $this->messages[ $this->bindings[$binding]['operations'][$operation]['output']['message'] ];

                     }

                     // Set operation style if necessary, but do not override one already provided

-					if (isset($bindingData['style']) && !isset($this->bindings[$binding]['operations'][$operation]['style'])) {

+                    if (isset($bindingData['style']) && !isset($this->bindings[$binding]['operations'][$operation]['style'])) {

                         $this->bindings[$binding]['operations'][$operation]['style'] = $bindingData['style'];

                     }

                     $this->bindings[$binding]['operations'][$operation]['transport'] = isset($bindingData['transport']) ? $bindingData['transport'] : '';

@@ -182,7 +182,7 @@ 
                 }

             }

         }

-	}

+    }

 

     /**

      * parses the wsdl document

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

      */

     function parseWSDL($wsdl = '') {

-		$this->debug("parse WSDL at path=$wsdl");

+        $this->debug("parse WSDL at path=$wsdl");

 

         if ($wsdl == '') {

             $this->debug('no wsdl passed to parseWSDL()!!');

@@ -204,38 +204,38 @@ 
 

         if (isset($wsdl_props['scheme']) && ($wsdl_props['scheme'] == 'http' || $wsdl_props['scheme'] == 'https')) {

             $this->debug('getting WSDL http(s) URL ' . $wsdl);

-        	// get wsdl

-	        $tr = new soap_transport_http($wsdl, $this->curl_options, $this->use_curl);

-			$tr->request_method = 'GET';

-			$tr->useSOAPAction = false;

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

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

-			}

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

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

-			}

-			$tr->setEncoding('gzip, deflate');

-			$wsdl_string = $tr->send('', $this->timeout, $this->response_timeout);

-			//$this->debug("WSDL request\n" . $tr->outgoing_payload);

-			//$this->debug("WSDL response\n" . $tr->incoming_payload);

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

-			// catch errors

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

-				$errstr = 'Getting ' . $wsdl . ' - HTTP ERROR: '.$err;

-				$this->debug($errstr);

-	            $this->setError($errstr);

-				unset($tr);

-	            return false;

-			}

-			unset($tr);

-			$this->debug("got WSDL URL");

+            // get wsdl

+            $tr = new soap_transport_http($wsdl, $this->curl_options, $this->use_curl);

+            $tr->request_method = 'GET';

+            $tr->useSOAPAction = false;

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

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

+            }

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

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

+            }

+            $tr->setEncoding('gzip, deflate');

+            $wsdl_string = $tr->send('', $this->timeout, $this->response_timeout);

+            //$this->debug("WSDL request\n" . $tr->outgoing_payload);

+            //$this->debug("WSDL response\n" . $tr->incoming_payload);

+            $this->appendDebug($tr->getDebug());

+            // catch errors

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

+                $errstr = 'Getting ' . $wsdl . ' - HTTP ERROR: '.$err;

+                $this->debug($errstr);

+                $this->setError($errstr);

+                unset($tr);

+                return false;

+            }

+            unset($tr);

+            $this->debug("got WSDL URL");

         } else {

             // $wsdl is not http(s), so treat it as a file URL or plain file path

-        	if (isset($wsdl_props['scheme']) && ($wsdl_props['scheme'] == 'file') && isset($wsdl_props['path'])) {

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

-        	} else {

-        		$path = $wsdl;

-        	}

+            if (isset($wsdl_props['scheme']) && ($wsdl_props['scheme'] == 'file') && isset($wsdl_props['path'])) {

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

+            } else {

+                $path = $wsdl;

+            }

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

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

                 $wsdl_string = '';

@@ -244,8 +244,8 @@ 
                 }

                 fclose($fp);

             } else {

-            	$errstr = "Bad path to WSDL file $path";

-            	$this->debug($errstr);

+                $errstr = "Bad path to WSDL file $path";

+                $this->debug($errstr);

                 $this->setError($errstr);

                 return false;

             }

@@ -266,23 +266,23 @@ 
         if (!xml_parse($this->parser, $wsdl_string, true)) {

             // Display an error message.

             $errstr = sprintf(

-				'XML error parsing WSDL from %s on line %d: %s',

-				$wsdl,

+                'XML error parsing WSDL from %s on line %d: %s',

+                $wsdl,

                 xml_get_current_line_number($this->parser),

                 xml_error_string(xml_get_error_code($this->parser))

                 );

             $this->debug($errstr);

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

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

             $this->setError($errstr);

             return false;

         }

-		// free the parser

+        // free the parser

         xml_parser_free($this->parser);

         $this->debug('Parsing WSDL done');

-		// catch wsdl parse errors

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

-			return false;

-		}

+        // catch wsdl parse errors

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

+            return false;

+        }

         return true;

     }

 

@@ -301,7 +301,7 @@ 
             $this->appendDebug($this->currentSchema->getDebug());

             $this->currentSchema->clearDebug();

         } elseif (preg_match('/schema$/', $name)) {

-        	$this->debug('Parsing WSDL schema');

+            $this->debug('Parsing WSDL schema');

             // $this->debug("startElement for $name ($attrs[name]). status = $this->status (".$this->getLocalPart($name).")");

             $this->status = 'schema';

             $this->currentSchema = new nusoap_xmlschema('', '', $this->namespaces);

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

             // process attributes

             if (count($attrs) > 0) {

-				// register namespace declarations

+                // register namespace declarations

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

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

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

@@ -352,417 +352,417 @@ 
                 // get unqualified name

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

             }

-			// process attributes, expanding any prefixes to namespaces

+            // process attributes, expanding any prefixes to namespaces

             // find status, register data

             switch ($this->status) {

                 case 'message':

                     if ($name == 'part') {

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

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

-		                    $this->messages[$this->currentMessage][$attrs['name']] = $attrs['type'];

-            			}

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

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

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

-			            }

-        			}

-        			break;

-			    case 'portType':

-			        switch ($name) {

-			            case 'operation':

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

-			                $this->debug("portType $this->currentPortType operation: $this->currentPortOperation");

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

-			                	$this->portTypes[$this->currentPortType][$attrs['name']]['parameterOrder'] = $attrs['parameterOrder'];

-			        		}

-			        		break;

-					    case 'documentation':

-					        $this->documentation = true;

-					        break;

-					    // merge input/output data

-					    default:

-					        $m = isset($attrs['message']) ? $this->getLocalPart($attrs['message']) : '';

-					        $this->portTypes[$this->currentPortType][$this->currentPortOperation][$name]['message'] = $m;

-					        break;

-					}

-			    	break;

-				case 'binding':

-				    switch ($name) {

-				        case 'binding':

-				            // get ns prefix

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

-				            $this->bindings[$this->currentBinding]['prefix'] = $prefix;

-					    	}

-					    	$this->bindings[$this->currentBinding] = array_merge($this->bindings[$this->currentBinding], $attrs);

-					    	break;

-						case 'header':

-						    $this->bindings[$this->currentBinding]['operations'][$this->currentOperation][$this->opStatus]['headers'][] = $attrs;

-						    break;

-						case 'operation':

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

-						        $this->bindings[$this->currentBinding]['operations'][$this->currentOperation]['soapAction'] = $attrs['soapAction'];

-						    }

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

-						        $this->bindings[$this->currentBinding]['operations'][$this->currentOperation]['style'] = $attrs['style'];

-						    }

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

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

-						        $this->debug("current binding operation: $this->currentOperation");

-						        $this->bindings[$this->currentBinding]['operations'][$this->currentOperation]['name'] = $attrs['name'];

-						        $this->bindings[$this->currentBinding]['operations'][$this->currentOperation]['binding'] = $this->currentBinding;

-						        $this->bindings[$this->currentBinding]['operations'][$this->currentOperation]['endpoint'] = isset($this->bindings[$this->currentBinding]['endpoint']) ? $this->bindings[$this->currentBinding]['endpoint'] : '';

-						    }

-						    break;

-						case 'input':

-						    $this->opStatus = 'input';

-						    break;

-						case 'output':

-						    $this->opStatus = 'output';

-						    break;

-						case 'body':

-						    if (isset($this->bindings[$this->currentBinding]['operations'][$this->currentOperation][$this->opStatus])) {

-						        $this->bindings[$this->currentBinding]['operations'][$this->currentOperation][$this->opStatus] = array_merge($this->bindings[$this->currentBinding]['operations'][$this->currentOperation][$this->opStatus], $attrs);

-						    } else {

-						        $this->bindings[$this->currentBinding]['operations'][$this->currentOperation][$this->opStatus] = $attrs;

-						    }

-						    break;

-					}

-					break;

-				case 'service':

-					switch ($name) {

-					    case 'port':

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

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

-					        $this->ports[$this->currentPort]['binding'] = $this->getLocalPart($attrs['binding']);

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

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

+                            $this->messages[$this->currentMessage][$attrs['name']] = $attrs['type'];

+                        }

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

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

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

+                        }

+                    }

+                    break;

+                case 'portType':

+                    switch ($name) {

+                        case 'operation':

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

+                            $this->debug("portType $this->currentPortType operation: $this->currentPortOperation");

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

+                                $this->portTypes[$this->currentPortType][$attrs['name']]['parameterOrder'] = $attrs['parameterOrder'];

+                            }

+                            break;

+                        case 'documentation':

+                            $this->documentation = true;

+                            break;

+                        // merge input/output data

+                        default:

+                            $m = isset($attrs['message']) ? $this->getLocalPart($attrs['message']) : '';

+                            $this->portTypes[$this->currentPortType][$this->currentPortOperation][$name]['message'] = $m;

+                            break;

+                    }

+                    break;

+                case 'binding':

+                    switch ($name) {

+                        case 'binding':

+                            // get ns prefix

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

+                            $this->bindings[$this->currentBinding]['prefix'] = $prefix;

+                            }

+                            $this->bindings[$this->currentBinding] = array_merge($this->bindings[$this->currentBinding], $attrs);

+                            break;

+                        case 'header':

+                            $this->bindings[$this->currentBinding]['operations'][$this->currentOperation][$this->opStatus]['headers'][] = $attrs;

+                            break;

+                        case 'operation':

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

+                                $this->bindings[$this->currentBinding]['operations'][$this->currentOperation]['soapAction'] = $attrs['soapAction'];

+                            }

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

+                                $this->bindings[$this->currentBinding]['operations'][$this->currentOperation]['style'] = $attrs['style'];

+                            }

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

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

+                                $this->debug("current binding operation: $this->currentOperation");

+                                $this->bindings[$this->currentBinding]['operations'][$this->currentOperation]['name'] = $attrs['name'];

+                                $this->bindings[$this->currentBinding]['operations'][$this->currentOperation]['binding'] = $this->currentBinding;

+                                $this->bindings[$this->currentBinding]['operations'][$this->currentOperation]['endpoint'] = isset($this->bindings[$this->currentBinding]['endpoint']) ? $this->bindings[$this->currentBinding]['endpoint'] : '';

+                            }

+                            break;

+                        case 'input':

+                            $this->opStatus = 'input';

+                            break;

+                        case 'output':

+                            $this->opStatus = 'output';

+                            break;

+                        case 'body':

+                            if (isset($this->bindings[$this->currentBinding]['operations'][$this->currentOperation][$this->opStatus])) {

+                                $this->bindings[$this->currentBinding]['operations'][$this->currentOperation][$this->opStatus] = array_merge($this->bindings[$this->currentBinding]['operations'][$this->currentOperation][$this->opStatus], $attrs);

+                            } else {

+                                $this->bindings[$this->currentBinding]['operations'][$this->currentOperation][$this->opStatus] = $attrs;

+                            }

+                            break;

+                    }

+                    break;

+                case 'service':

+                    switch ($name) {

+                        case 'port':

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

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

+                            $this->ports[$this->currentPort]['binding'] = $this->getLocalPart($attrs['binding']);

 

-					        break;

-					    case 'address':

-					        $this->ports[$this->currentPort]['location'] = $attrs['location'];

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

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

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

-					        break;

-					}

-					break;

-			}

-		// set status

-		switch ($name) {

-			case 'import':

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

+                            break;

+                        case 'address':

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

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

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

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

+                            break;

+                    }

+                    break;

+            }

+        // set status

+        switch ($name) {

+            case 'import':

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

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

                     $this->debug('parsing import ' . $attrs['namespace']. ' - ' . $attrs['location'] . ' (' . count($this->import[$attrs['namespace']]).')');

-				} else {

+                } else {

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

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

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

-					}

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

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

+                    }

                     $this->debug('parsing import ' . $attrs['namespace']. ' - [no location] (' . count($this->import[$attrs['namespace']]).')');

-				}

-				break;

-			//wait for schema

-			//case 'types':

-			//	$this->status = 'schema';

-			//	break;

-			case 'message':

-				$this->status = 'message';

-				$this->messages[$attrs['name']] = array();

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

-				break;

-			case 'portType':

-				$this->status = 'portType';

-				$this->portTypes[$attrs['name']] = array();

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

-				break;

-			case "binding":

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

-				// get binding name

-					if (strpos($attrs['name'], ':')) {

-			    		$this->currentBinding = $this->getLocalPart($attrs['name']);

-					} else {

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

-					}

-					$this->status = 'binding';

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

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

-				}

-				break;

-			case 'service':

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

-				$this->status = 'service';

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

-				break;

-			case 'definitions':

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

-					$this->wsdl_info[$name] = $value;

-				}

-				break;

-			}

-		}

-	}

+                }

+                break;

+            //wait for schema

+            //case 'types':

+            //	$this->status = 'schema';

+            //	break;

+            case 'message':

+                $this->status = 'message';

+                $this->messages[$attrs['name']] = array();

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

+                break;

+            case 'portType':

+                $this->status = 'portType';

+                $this->portTypes[$attrs['name']] = array();

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

+                break;

+            case "binding":

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

+                // get binding name

+                    if (strpos($attrs['name'], ':')) {

+                        $this->currentBinding = $this->getLocalPart($attrs['name']);

+                    } else {

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

+                    }

+                    $this->status = 'binding';

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

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

+                }

+                break;

+            case 'service':

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

+                $this->status = 'service';

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

+                break;

+            case 'definitions':

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

+                    $this->wsdl_info[$name] = $value;

+                }

+                break;

+            }

+        }

+    }

 

-	/**

-	* end-element handler

-	*

-	* @param string $parser XML parser object

-	* @param string $name element name

-	* @access private

-	*/

-	function end_element($parser, $name){

-		// unset schema status

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

-			$this->status = "";

+    /**

+     * end-element handler

+     *

+     * @param string $parser XML parser object

+     * @param string $name element name

+     * @access private

+     */

+    function end_element($parser, $name){

+        // unset schema status

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

+            $this->status = "";

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

             $this->currentSchema->clearDebug();

-			$this->schemas[$this->currentSchema->schemaTargetNamespace][] = $this->currentSchema;

-        	$this->debug('Parsing WSDL schema done');

-		}

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

-			$this->currentSchema->schemaEndElement($parser, $name);

-		} else {

-			// bring depth down a notch

-			$this->depth--;

-		}

-		// end documentation

-		if ($this->documentation) {

-			//TODO: track the node to which documentation should be assigned; it can be a part, message, etc.

-			//$this->portTypes[$this->currentPortType][$this->currentPortOperation]['documentation'] = $this->documentation;

-			$this->documentation = false;

-		}

-	}

+            $this->schemas[$this->currentSchema->schemaTargetNamespace][] = $this->currentSchema;

+            $this->debug('Parsing WSDL schema done');

+        }

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

+            $this->currentSchema->schemaEndElement($parser, $name);

+        } else {

+            // bring depth down a notch

+            $this->depth--;

+        }

+        // end documentation

+        if ($this->documentation) {

+            //TODO: track the node to which documentation should be assigned; it can be a part, message, etc.

+            //$this->portTypes[$this->currentPortType][$this->currentPortOperation]['documentation'] = $this->documentation;

+            $this->documentation = false;

+        }

+    }

 

-	/**

-	 * element content handler

-	 *

-	 * @param string $parser XML parser object

-	 * @param string $data element content

-	 * @access private

-	 */

-	function character_data($parser, $data)

-	{

-		$pos = isset($this->depth_array[$this->depth]) ? $this->depth_array[$this->depth] : 0;

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

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

-		}

-		if ($this->documentation) {

-			$this->documentation .= $data;

-		}

-	}

+    /**

+     * element content handler

+     *

+     * @param string $parser XML parser object

+     * @param string $data element content

+     * @access private

+     */

+    function character_data($parser, $data)

+    {

+        $pos = isset($this->depth_array[$this->depth]) ? $this->depth_array[$this->depth] : 0;

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

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

+        }

+        if ($this->documentation) {

+            $this->documentation .= $data;

+        }

+    }

 

-	/**

-	* if authenticating, set user credentials here

-	*

-	* @param    string $username

-	* @param    string $password

-	* @param	string $authtype (basic|digest|certificate|ntlm)

-	* @param	array $certRequest (keys must be cainfofile (optional), sslcertfile, sslkeyfile, passphrase, certpassword (optional), verifypeer (optional), verifyhost (optional): see corresponding options in cURL docs)

-	* @access   public

-	*/

-	function setCredentials($username, $password, $authtype = 'basic', $certRequest = array()) {

-		$this->debug("setCredentials username=$username authtype=$authtype certRequest=");

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

-		$this->username = $username;

-		$this->password = $password;

-		$this->authtype = $authtype;

-		$this->certRequest = $certRequest;

-	}

+    /**

+     * if authenticating, set user credentials here

+     *

+     * @param    string $username

+     * @param    string $password

+     * @param	string $authtype (basic|digest|certificate|ntlm)

+     * @param	array $certRequest (keys must be cainfofile (optional), sslcertfile, sslkeyfile, passphrase, certpassword (optional), verifypeer (optional), verifyhost (optional): see corresponding options in cURL docs)

+     * @access   public

+     */

+    function setCredentials($username, $password, $authtype = 'basic', $certRequest = array()) {

+        $this->debug("setCredentials username=$username authtype=$authtype certRequest=");

+        $this->appendDebug($this->varDump($certRequest));

+        $this->username = $username;

+        $this->password = $password;

+        $this->authtype = $authtype;

+        $this->certRequest = $certRequest;

+    }

 

-	function getBindingData($binding)

-	{

-		if (is_array($this->bindings[$binding])) {

-			return $this->bindings[$binding];

-		}

-	}

+    function getBindingData($binding)

+    {

+        if (is_array($this->bindings[$binding])) {

+            return $this->bindings[$binding];

+        }

+    }

 

-	/**

-	 * returns an assoc array of operation names => operation data

-	 *

-	 * @param string $portName WSDL port name

-	 * @param string $bindingType eg: soap, smtp, dime (only soap and soap12 are currently supported)

-	 * @return array

-	 * @access public

-	 */

-	function getOperations($portName = '', $bindingType = 'soap') {

-		$ops = array();

-		if ($bindingType == 'soap') {

-			$bindingType = 'http://schemas.xmlsoap.org/wsdl/soap/';

-		} elseif ($bindingType == 'soap12') {

-			$bindingType = 'http://schemas.xmlsoap.org/wsdl/soap12/';

-		} else {

-			$this->debug("getOperations bindingType $bindingType may not be supported");

-		}

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

-		// loop thru ports

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

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

-			if ($portName == '' || $port == $portName) {

-				// binding type of port matches parameter

-				if ($portData['bindingType'] == $bindingType) {

-					$this->debug("getOperations found port $port bindingType $bindingType");

-					//$this->debug("port data: " . $this->varDump($portData));

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

-					// merge bindings

-					if (isset($this->bindings[ $portData['binding'] ]['operations'])) {

-						$ops = array_merge ($ops, $this->bindings[ $portData['binding'] ]['operations']);

-					}

-				}

-			}

-		}

-		if (count($ops) == 0) {

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

-		}

-		return $ops;

-	}

+    /**

+     * returns an assoc array of operation names => operation data

+     *

+     * @param string $portName WSDL port name

+     * @param string $bindingType eg: soap, smtp, dime (only soap and soap12 are currently supported)

+     * @return array

+     * @access public

+     */

+    function getOperations($portName = '', $bindingType = 'soap') {

+        $ops = array();

+        if ($bindingType == 'soap') {

+            $bindingType = 'http://schemas.xmlsoap.org/wsdl/soap/';

+        } elseif ($bindingType == 'soap12') {

+            $bindingType = 'http://schemas.xmlsoap.org/wsdl/soap12/';

+        } else {

+            $this->debug("getOperations bindingType $bindingType may not be supported");

+        }

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

+        // loop thru ports

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

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

+            if ($portName == '' || $port == $portName) {

+                // binding type of port matches parameter

+                if ($portData['bindingType'] == $bindingType) {

+                    $this->debug("getOperations found port $port bindingType $bindingType");

+                    //$this->debug("port data: " . $this->varDump($portData));

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

+                    // merge bindings

+                    if (isset($this->bindings[ $portData['binding'] ]['operations'])) {

+                        $ops = array_merge ($ops, $this->bindings[ $portData['binding'] ]['operations']);

+                    }

+                }

+            }

+        }

+        if (count($ops) == 0) {

+            $this->debug("getOperations found no operations for port '$portName' bindingType $bindingType");

+        }

+        return $ops;

+    }

 

-	/**

-	 * returns an associative array of data necessary for calling an operation

-	 *

-	 * @param string $operation name of operation

-	 * @param string $bindingType type of binding eg: soap, soap12

-	 * @return array

-	 * @access public

-	 */

-	function getOperationData($operation, $bindingType = 'soap')

-	{

-		if ($bindingType == 'soap') {

-			$bindingType = 'http://schemas.xmlsoap.org/wsdl/soap/';

-		} elseif ($bindingType == 'soap12') {

-			$bindingType = 'http://schemas.xmlsoap.org/wsdl/soap12/';

-		}

-		// loop thru ports

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

-			// binding type of port matches parameter

-			if ($portData['bindingType'] == $bindingType) {

-				// get binding

-				//foreach($this->bindings[ $portData['binding'] ]['operations'] as $bOperation => $opData) {

-				foreach(array_keys($this->bindings[ $portData['binding'] ]['operations']) as $bOperation) {

-					// note that we could/should also check the namespace here

-					if ($operation == $bOperation) {

-						$opData = $this->bindings[ $portData['binding'] ]['operations'][$operation];

-					    return $opData;

-					}

-				}

-			}

-		}

-	}

+    /**

+     * returns an associative array of data necessary for calling an operation

+     *

+     * @param string $operation name of operation

+     * @param string $bindingType type of binding eg: soap, soap12

+     * @return array

+     * @access public

+     */

+    function getOperationData($operation, $bindingType = 'soap')

+    {

+        if ($bindingType == 'soap') {

+            $bindingType = 'http://schemas.xmlsoap.org/wsdl/soap/';

+        } elseif ($bindingType == 'soap12') {

+            $bindingType = 'http://schemas.xmlsoap.org/wsdl/soap12/';

+        }

+        // loop thru ports

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

+            // binding type of port matches parameter

+            if ($portData['bindingType'] == $bindingType) {

+                // get binding

+                //foreach($this->bindings[ $portData['binding'] ]['operations'] as $bOperation => $opData) {

+                foreach(array_keys($this->bindings[ $portData['binding'] ]['operations']) as $bOperation) {

+                    // note that we could/should also check the namespace here

+                    if ($operation == $bOperation) {

+                        $opData = $this->bindings[ $portData['binding'] ]['operations'][$operation];

+                        return $opData;

+                    }

+                }

+            }

+        }

+    }

 

-	/**

-	 * returns an associative array of data necessary for calling an operation

-	 *

-	 * @param string $soapAction soapAction for operation

-	 * @param string $bindingType type of binding eg: soap, soap12

-	 * @return array

-	 * @access public

-	 */

-	function getOperationDataForSoapAction($soapAction, $bindingType = 'soap') {

-		if ($bindingType == 'soap') {

-			$bindingType = 'http://schemas.xmlsoap.org/wsdl/soap/';

-		} elseif ($bindingType == 'soap12') {

-			$bindingType = 'http://schemas.xmlsoap.org/wsdl/soap12/';

-		}

-		// loop thru ports

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

-			// binding type of port matches parameter

-			if ($portData['bindingType'] == $bindingType) {

-				// loop through operations for the binding

-				foreach ($this->bindings[ $portData['binding'] ]['operations'] as $bOperation => $opData) {

-					if ($opData['soapAction'] == $soapAction) {

-					    return $opData;

-					}

-				}

-			}

-		}

-	}

+    /**

+     * returns an associative array of data necessary for calling an operation

+     *

+     * @param string $soapAction soapAction for operation

+     * @param string $bindingType type of binding eg: soap, soap12

+     * @return array

+     * @access public

+     */

+    function getOperationDataForSoapAction($soapAction, $bindingType = 'soap') {

+        if ($bindingType == 'soap') {

+            $bindingType = 'http://schemas.xmlsoap.org/wsdl/soap/';

+        } elseif ($bindingType == 'soap12') {

+            $bindingType = 'http://schemas.xmlsoap.org/wsdl/soap12/';

+        }

+        // loop thru ports

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

+            // binding type of port matches parameter

+            if ($portData['bindingType'] == $bindingType) {

+                // loop through operations for the binding

+                foreach ($this->bindings[ $portData['binding'] ]['operations'] as $bOperation => $opData) {

+                    if ($opData['soapAction'] == $soapAction) {

+                        return $opData;

+                    }

+                }

+            }

+        }

+    }

 

-	/**

-    * returns an array of information about a given type

-    * returns false if no type exists by the given name

-    *

-	*	 typeDef = array(

-	*	 'elements' => array(), // refs to elements array

-	*	'restrictionBase' => '',

-	*	'phpType' => '',

-	*	'order' => '(sequence|all)',

-	*	'attrs' => array() // refs to attributes array

-	*	)

-    *

-    * @param string $type the type

-    * @param string $ns namespace (not prefix) of the type

-    * @return mixed

-    * @access public

-    * @see nusoap_xmlschema

-    */

-	function getTypeDef($type, $ns) {

-		$this->debug("in getTypeDef: type=$type, ns=$ns");

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

-			$ns = $this->namespaces['tns'];

-			$this->debug("in getTypeDef: type namespace forced to $ns");

-		}

-		if (!isset($this->schemas[$ns])) {

-			foreach ($this->schemas as $ns0 => $schema0) {

-				if (strcasecmp($ns, $ns0) == 0) {

-					$this->debug("in getTypeDef: replacing schema namespace $ns with $ns0");

-					$ns = $ns0;

-					break;

-				}

-			}

-		}

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

-			$this->debug("in getTypeDef: have schema for namespace $ns");

-			for ($i = 0; $i < count($this->schemas[$ns]); $i++) {

-				$xs = &$this->schemas[$ns][$i];

-				$t = $xs->getTypeDef($type);

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

-				$xs->clearDebug();

-				if ($t) {

-					$this->debug("in getTypeDef: found type $type");

-					if (!isset($t['phpType'])) {

-						// get info for type to tack onto the element

-						$uqType = substr($t['type'], strrpos($t['type'], ':') + 1);

-						$ns = substr($t['type'], 0, strrpos($t['type'], ':'));

-						$etype = $this->getTypeDef($uqType, $ns);

-						if ($etype) {

-							$this->debug("found type for [element] $type:");

-							$this->debug($this->varDump($etype));

-							if (isset($etype['phpType'])) {

-								$t['phpType'] = $etype['phpType'];

-							}

-							if (isset($etype['elements'])) {

-								$t['elements'] = $etype['elements'];

-							}

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

-								$t['attrs'] = $etype['attrs'];

-							}

-						} else {

-							$this->debug("did not find type for [element] $type");

-						}

-					}

-					return $t;

-				}

-			}

-			$this->debug("in getTypeDef: did not find type $type");

-		} else {

-			$this->debug("in getTypeDef: do not have schema for namespace $ns");

-		}

-		return false;

-	}

+    /**

+     * returns an array of information about a given type

+     * returns false if no type exists by the given name

+     *

+     *	 typeDef = array(

+     *	 'elements' => array(), // refs to elements array

+     *	'restrictionBase' => '',

+     *	'phpType' => '',

+     *	'order' => '(sequence|all)',

+     *	'attrs' => array() // refs to attributes array

+     *	)

+     *

+     * @param string $type the type

+     * @param string $ns namespace (not prefix) of the type

+     * @return mixed

+     * @access public

+     * @see nusoap_xmlschema

+     */

+    function getTypeDef($type, $ns) {

+        $this->debug("in getTypeDef: type=$type, ns=$ns");

+        if ((! $ns) && isset($this->namespaces['tns'])) {

+            $ns = $this->namespaces['tns'];

+            $this->debug("in getTypeDef: type namespace forced to $ns");

+        }

+        if (!isset($this->schemas[$ns])) {

+            foreach ($this->schemas as $ns0 => $schema0) {

+                if (strcasecmp($ns, $ns0) == 0) {

+                    $this->debug("in getTypeDef: replacing schema namespace $ns with $ns0");

+                    $ns = $ns0;

+                    break;

+                }

+            }

+        }

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

+            $this->debug("in getTypeDef: have schema for namespace $ns");

+            for ($i = 0; $i < count($this->schemas[$ns]); $i++) {

+                $xs = &$this->schemas[$ns][$i];

+                $t = $xs->getTypeDef($type);

+                $this->appendDebug($xs->getDebug());

+                $xs->clearDebug();

+                if ($t) {

+                    $this->debug("in getTypeDef: found type $type");

+                    if (!isset($t['phpType'])) {

+                        // get info for type to tack onto the element

+                        $uqType = substr($t['type'], strrpos($t['type'], ':') + 1);

+                        $ns = substr($t['type'], 0, strrpos($t['type'], ':'));

+                        $etype = $this->getTypeDef($uqType, $ns);

+                        if ($etype) {

+                            $this->debug("found type for [element] $type:");

+                            $this->debug($this->varDump($etype));

+                            if (isset($etype['phpType'])) {

+                                $t['phpType'] = $etype['phpType'];

+                            }

+                            if (isset($etype['elements'])) {

+                                $t['elements'] = $etype['elements'];

+                            }

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

+                                $t['attrs'] = $etype['attrs'];

+                            }

+                        } else {

+                            $this->debug("did not find type for [element] $type");

+                        }

+                    }

+                    return $t;

+                }

+            }

+            $this->debug("in getTypeDef: did not find type $type");

+        } else {

+            $this->debug("in getTypeDef: do not have schema for namespace $ns");

+        }

+        return false;

+    }

 

     /**

-    * prints html description of services

-    *

-    * @access private

-    */

+     * prints html description of services

+     *

+     * @access private

+     */

     function webDescription(){

-    	global $HTTP_SERVER_VARS;

+        global $HTTP_SERVER_VARS;

 

-		if (isset($_SERVER)) {

-			$PHP_SELF = $_SERVER['PHP_SELF'];

-		} elseif (isset($HTTP_SERVER_VARS)) {

-			$PHP_SELF = $HTTP_SERVER_VARS['PHP_SELF'];

-		} else {

-			$this->setError("Neither _SERVER nor HTTP_SERVER_VARS is available");

-		}

+        if (isset($_SERVER)) {

+            $PHP_SELF = $_SERVER['PHP_SELF'];

+        } elseif (isset($HTTP_SERVER_VARS)) {

+            $PHP_SELF = $HTTP_SERVER_VARS['PHP_SELF'];

+        } else {

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

+        }

 

-		$b = '

+        $b = '

 		<html><head><title>NuSOAP: '.$this->serviceName.'</title>

 		<style type="text/css">

 		    body    { font-family: arial; color: #000000; background-color: #ffffff; margin: 0px 0px 0px 0px; }

@@ -845,1092 +845,1092 @@ 
 				<p>View the <a href="'.$PHP_SELF.'?wsdl">WSDL</a> for the service.

 				Click on an operation name to view it&apos;s details.</p>

 				<ul>';

-				foreach($this->getOperations() as $op => $data){

-				    $b .= "<li><a href='#' onclick=\"popout();popup('$op')\">$op</a></li>";

-				    // create hidden div

-				    $b .= "<div id='$op' class='hidden'>

+                foreach($this->getOperations() as $op => $data){

+                    $b .= "<li><a href='#' onclick=\"popout();popup('$op')\">$op</a></li>";

+                    // create hidden div

+                    $b .= "<div id='$op' class='hidden'>

 				    <a href='#' onclick='popout()'><font color='#ffffff'>Close</font></a><br><br>";

-				    foreach($data as $donnie => $marie){ // loop through opdata

-						if($donnie == 'input' || $donnie == 'output'){ // show input/output data

-						    $b .= "<font color='white'>".ucfirst($donnie).':</font><br>';

-						    foreach($marie as $captain => $tenille){ // loop through data

-								if($captain == 'parts'){ // loop thru parts

-								    $b .= "&nbsp;&nbsp;$captain:<br>";

-					                //if(is_array($tenille)){

-								    	foreach($tenille as $joanie => $chachi){

-											$b .= "&nbsp;&nbsp;&nbsp;&nbsp;$joanie: $chachi<br>";

-								    	}

-					        		//}

-								} else {

-								    $b .= "&nbsp;&nbsp;$captain: $tenille<br>";

-								}

-						    }

-						} else {

-						    $b .= "<font color='white'>".ucfirst($donnie).":</font> $marie<br>";

-						}

-				    }

-					$b .= '</div>';

-				}

-				$b .= '

+                    foreach($data as $donnie => $marie){ // loop through opdata

+                        if($donnie == 'input' || $donnie == 'output'){ // show input/output data

+                            $b .= "<font color='white'>".ucfirst($donnie).':</font><br>';

+                            foreach($marie as $captain => $tenille){ // loop through data

+                                if($captain == 'parts'){ // loop thru parts

+                                    $b .= "&nbsp;&nbsp;$captain:<br>";

+                                    //if(is_array($tenille)){

+                                        foreach($tenille as $joanie => $chachi){

+                                            $b .= "&nbsp;&nbsp;&nbsp;&nbsp;$joanie: $chachi<br>";

+                                        }

+                                    //}

+                                } else {

+                                    $b .= "&nbsp;&nbsp;$captain: $tenille<br>";

+                                }

+                            }

+                        } else {

+                            $b .= "<font color='white'>".ucfirst($donnie).":</font> $marie<br>";

+                        }

+                    }

+                    $b .= '</div>';

+                }

+                $b .= '

 				<ul>

 			</div>

 		</div></body></html>';

-		return $b;

+        return $b;

     }

 

-	/**

-	* serialize the parsed wsdl

-	*

-	* @param mixed $debug whether to put debug=1 in endpoint URL

-	* @return string serialization of WSDL

-	* @access public

-	*/

-	function serialize($debug = 0)

-	{

-		$xml = '<?xml version="1.0" encoding="ISO-8859-1"?>';

-		$xml .= "\n<definitions";

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

-			$xml .= " xmlns:$k=\"$v\"";

-		}

-		// 10.9.02 - add poulter fix for wsdl and tns declarations

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

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

-		}

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

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

-		}

-		$xml .= '>';

-		// imports

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

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

-				foreach ($list as $ii) {

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

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

-					} else {

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

-					}

-				}

-			}

-		}

-		// types

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

-			$xml .= "\n<types>\n";

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

-				foreach ($list as $xs) {

-					$xml .= $xs->serializeSchema();

-				}

-			}

-			$xml .= '</types>';

-		}

-		// messages

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

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

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

-				if(is_array($msgParts)){

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

-						// print 'serializing '.$partType.', sv: '.$this->XMLSchemaVersion.'<br>';

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

-						    $typePrefix = $this->getPrefixFromNamespace($this->getPrefix($partType));

-						} elseif (isset($this->typemap[$this->namespaces['xsd']][$partType])) {

-						    // print 'checking typemap: '.$this->XMLSchemaVersion.'<br>';

-						    $typePrefix = 'xsd';

-						} else {

-						    foreach($this->typemap as $ns => $types) {

-						        if (isset($types[$partType])) {

-						            $typePrefix = $this->getPrefixFromNamespace($ns);

-						        }

-						    }

-						    if (!isset($typePrefix)) {

-						        die("$partType has no namespace!");

-						    }

-						}

-						$ns = $this->getNamespaceFromPrefix($typePrefix);

-						$localPart = $this->getLocalPart($partType);

-						$typeDef = $this->getTypeDef($localPart, $ns);

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

-							$elementortype = 'element';

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

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

-							}

-						} else {

-							$elementortype = 'type';

-						}

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

-					}

-				}

-				$xml .= '</message>';

-			}

-		}

-		// bindings & porttypes

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

-			$binding_xml = '';

-			$portType_xml = '';

-			foreach($this->bindings as $bindingName => $attrs) {

-				$binding_xml .= "\n<binding name=\"" . $bindingName . '" type="tns:' . $attrs['portType'] . '">';

-				$binding_xml .= "\n" . '  <soap:binding style="' . $attrs['style'] . '" transport="' . $attrs['transport'] . '"/>';

-				$portType_xml .= "\n<portType name=\"" . $attrs['portType'] . '">';

-				foreach($attrs['operations'] as $opName => $opParts) {

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

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

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

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

-					} else {

-						$enc_style = '';

-					}

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

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

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

-					} else {

-						$enc_style = '';

-					}

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

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

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

-					if (isset($opParts['parameterOrder'])) {

-					    $portType_xml .= ' parameterOrder="' . $opParts['parameterOrder'] . '"';

-					}

-					$portType_xml .= '>';

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

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

-					}

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

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

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

-				}

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

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

-			}

-			$xml .= $portType_xml . $binding_xml;

-		}

-		// services

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

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

-			foreach($this->ports as $pName => $attrs) {

-				$xml .= "\n" . '  <port name="' . $pName . '" binding="tns:' . $attrs['binding'] . '">';

-				$xml .= "\n" . '    <soap:address location="' . $attrs['location'] . ($debug ? '?debug=1' : '') . '"/>';

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

-			}

-		}

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

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

-	}

+    /**

+     * serialize the parsed wsdl

+     *

+     * @param mixed $debug whether to put debug=1 in endpoint URL

+     * @return string serialization of WSDL

+     * @access public

+     */

+    function serialize($debug = 0)

+    {

+        $xml = '<?xml version="1.0" encoding="ISO-8859-1"?>';

+        $xml .= "\n<definitions";

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

+            $xml .= " xmlns:$k=\"$v\"";

+        }

+        // 10.9.02 - add poulter fix for wsdl and tns declarations

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

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

+        }

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

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

+        }

+        $xml .= '>';

+        // imports

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

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

+                foreach ($list as $ii) {

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

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

+                    } else {

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

+                    }

+                }

+            }

+        }

+        // types

+        if (count($this->schemas)>=1) {

+            $xml .= "\n<types>\n";

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

+                foreach ($list as $xs) {

+                    $xml .= $xs->serializeSchema();

+                }

+            }

+            $xml .= '</types>';

+        }

+        // messages

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

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

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

+                if(is_array($msgParts)){

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

+                        // print 'serializing '.$partType.', sv: '.$this->XMLSchemaVersion.'<br>';

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

+                            $typePrefix = $this->getPrefixFromNamespace($this->getPrefix($partType));

+                        } elseif (isset($this->typemap[$this->namespaces['xsd']][$partType])) {

+                            // print 'checking typemap: '.$this->XMLSchemaVersion.'<br>';

+                            $typePrefix = 'xsd';

+                        } else {

+                            foreach($this->typemap as $ns => $types) {

+                                if (isset($types[$partType])) {

+                                    $typePrefix = $this->getPrefixFromNamespace($ns);

+                                }

+                            }

+                            if (!isset($typePrefix)) {

+                                die("$partType has no namespace!");

+                            }

+                        }

+                        $ns = $this->getNamespaceFromPrefix($typePrefix);

+                        $localPart = $this->getLocalPart($partType);

+                        $typeDef = $this->getTypeDef($localPart, $ns);

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

+                            $elementortype = 'element';

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

+                                $localPart = substr($localPart, 0, -1);

+                            }

+                        } else {

+                            $elementortype = 'type';

+                        }

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

+                    }

+                }

+                $xml .= '</message>';

+            }

+        }

+        // bindings & porttypes

+        if (count($this->bindings) >= 1) {

+            $binding_xml = '';

+            $portType_xml = '';

+            foreach($this->bindings as $bindingName => $attrs) {

+                $binding_xml .= "\n<binding name=\"" . $bindingName . '" type="tns:' . $attrs['portType'] . '">';

+                $binding_xml .= "\n" . '  <soap:binding style="' . $attrs['style'] . '" transport="' . $attrs['transport'] . '"/>';

+                $portType_xml .= "\n<portType name=\"" . $attrs['portType'] . '">';

+                foreach($attrs['operations'] as $opName => $opParts) {

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

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

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

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

+                    } else {

+                        $enc_style = '';

+                    }

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

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

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

+                    } else {

+                        $enc_style = '';

+                    }

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

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

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

+                    if (isset($opParts['parameterOrder'])) {

+                        $portType_xml .= ' parameterOrder="' . $opParts['parameterOrder'] . '"';

+                    }

+                    $portType_xml .= '>';

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

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

+                    }

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

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

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

+                }

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

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

+            }

+            $xml .= $portType_xml . $binding_xml;

+        }

+        // services

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

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

+            foreach($this->ports as $pName => $attrs) {

+                $xml .= "\n" . '  <port name="' . $pName . '" binding="tns:' . $attrs['binding'] . '">';

+                $xml .= "\n" . '    <soap:address location="' . $attrs['location'] . ($debug ? '?debug=1' : '') . '"/>';

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

+            }

+        }

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

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

+    }

 

-	/**

-	 * determine whether a set of parameters are unwrapped

-	 * when they are expect to be wrapped, Microsoft-style.

-	 *

-	 * @param string $type the type (element name) of the wrapper

-	 * @param array $parameters the parameter values for the SOAP call

-	 * @return boolean whether they parameters are unwrapped (and should be wrapped)

-	 * @access private

-	 */

-	function parametersMatchWrapped($type, &$parameters) {

-		$this->debug("in parametersMatchWrapped type=$type, parameters=");

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

+    /**

+     * determine whether a set of parameters are unwrapped

+     * when they are expect to be wrapped, Microsoft-style.

+     *

+     * @param string $type the type (element name) of the wrapper

+     * @param array $parameters the parameter values for the SOAP call

+     * @return boolean whether they parameters are unwrapped (and should be wrapped)

+     * @access private

+     */

+    function parametersMatchWrapped($type, &$parameters) {

+        $this->debug("in parametersMatchWrapped type=$type, parameters=");

+        $this->appendDebug($this->varDump($parameters));

 

-		// split type into namespace:unqualified-type

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

-			$uqType = substr($type, strrpos($type, ':') + 1);

-			$ns = substr($type, 0, strrpos($type, ':'));

-			$this->debug("in parametersMatchWrapped: got a prefixed type: $uqType, $ns");

-			if ($this->getNamespaceFromPrefix($ns)) {

-				$ns = $this->getNamespaceFromPrefix($ns);

-				$this->debug("in parametersMatchWrapped: expanded prefixed type: $uqType, $ns");

-			}

-		} else {

-			// TODO: should the type be compared to types in XSD, and the namespace

-			// set to XSD if the type matches?

-			$this->debug("in parametersMatchWrapped: No namespace for type $type");

-			$ns = '';

-			$uqType = $type;

-		}

+        // split type into namespace:unqualified-type

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

+            $uqType = substr($type, strrpos($type, ':') + 1);

+            $ns = substr($type, 0, strrpos($type, ':'));

+            $this->debug("in parametersMatchWrapped: got a prefixed type: $uqType, $ns");

+            if ($this->getNamespaceFromPrefix($ns)) {

+                $ns = $this->getNamespaceFromPrefix($ns);

+                $this->debug("in parametersMatchWrapped: expanded prefixed type: $uqType, $ns");

+            }

+        } else {

+            // TODO: should the type be compared to types in XSD, and the namespace

+            // set to XSD if the type matches?

+            $this->debug("in parametersMatchWrapped: No namespace for type $type");

+            $ns = '';

+            $uqType = $type;

+        }

 

-		// get the type information

-		if (!$typeDef = $this->getTypeDef($uqType, $ns)) {

-			$this->debug("in parametersMatchWrapped: $type ($uqType) is not a supported type.");

-			return false;

-		}

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

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

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

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

-		}

-		$phpType = $typeDef['phpType'];

-		$arrayType = (isset($typeDef['arrayType']) ? $typeDef['arrayType'] : '');

-		$this->debug("in parametersMatchWrapped: uqType: $uqType, ns: $ns, phptype: $phpType, arrayType: $arrayType");

+        // get the type information

+        if (!$typeDef = $this->getTypeDef($uqType, $ns)) {

+            $this->debug("in parametersMatchWrapped: $type ($uqType) is not a supported type.");

+            return false;

+        }

+        $this->debug("in parametersMatchWrapped: found typeDef=");

+        $this->appendDebug($this->varDump($typeDef));

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

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

+        }

+        $phpType = $typeDef['phpType'];

+        $arrayType = (isset($typeDef['arrayType']) ? $typeDef['arrayType'] : '');

+        $this->debug("in parametersMatchWrapped: uqType: $uqType, ns: $ns, phptype: $phpType, arrayType: $arrayType");

 

-		// we expect a complexType or element of complexType

-		if ($phpType != 'struct') {

-			$this->debug("in parametersMatchWrapped: not a struct");

-			return false;

-		}

+        // we expect a complexType or element of complexType

+        if ($phpType != 'struct') {

+            $this->debug("in parametersMatchWrapped: not a struct");

+            return false;

+        }

 

-		// see whether the parameter names match the elements

-		if (isset($typeDef['elements']) && is_array($typeDef['elements'])) {

-			$elements = 0;

-			$matches = 0;

-			foreach ($typeDef['elements'] as $name => $attrs) {

-				if (isset($parameters[$name])) {

-					$this->debug("in parametersMatchWrapped: have parameter named $name");

-					$matches++;

-				} else {

-					$this->debug("in parametersMatchWrapped: do not have parameter named $name");

-				}

-				$elements++;

-			}

+        // see whether the parameter names match the elements

+        if (isset($typeDef['elements']) && is_array($typeDef['elements'])) {

+            $elements = 0;

+            $matches = 0;

+            foreach ($typeDef['elements'] as $name => $attrs) {

+                if (isset($parameters[$name])) {

+                    $this->debug("in parametersMatchWrapped: have parameter named $name");

+                    $matches++;

+                } else {

+                    $this->debug("in parametersMatchWrapped: do not have parameter named $name");

+                }

+                $elements++;

+            }

 

-			$this->debug("in parametersMatchWrapped: $matches parameter names match $elements wrapped parameter names");

-			if ($matches == 0) {

-				return false;

-			}

-			return true;

-		}

+            $this->debug("in parametersMatchWrapped: $matches parameter names match $elements wrapped parameter names");

+            if ($matches == 0) {

+                return false;

+            }

+            return true;

+        }

 

-		// since there are no elements for the type, if the user passed no

-		// parameters, the parameters match wrapped.

-		$this->debug("in parametersMatchWrapped: no elements type $ns:$uqType");

-		return count($parameters) == 0;

-	}

+        // since there are no elements for the type, if the user passed no

+        // parameters, the parameters match wrapped.

+        $this->debug("in parametersMatchWrapped: no elements type $ns:$uqType");

+        return count($parameters) == 0;

+    }

 

-	/**

-	 * serialize PHP values according to a WSDL message definition

-	 * contrary to the method name, this is not limited to RPC

-	 *

-	 * TODO

-	 * - multi-ref serialization

-	 * - validate PHP values against type definitions, return errors if invalid

-	 *

-	 * @param string $operation operation name

-	 * @param string $direction (input|output)

-	 * @param mixed $parameters parameter value(s)

-	 * @param string $bindingType (soap|soap12)

-	 * @return mixed parameters serialized as XML or false on error (e.g. operation not found)

-	 * @access public

-	 */

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

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

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

+    /**

+     * serialize PHP values according to a WSDL message definition

+     * contrary to the method name, this is not limited to RPC

+     *

+     * TODO

+     * - multi-ref serialization

+     * - validate PHP values against type definitions, return errors if invalid

+     *

+     * @param string $operation operation name

+     * @param string $direction (input|output)

+     * @param mixed $parameters parameter value(s)

+     * @param string $bindingType (soap|soap12)

+     * @return mixed parameters serialized as XML or false on error (e.g. operation not found)

+     * @access public

+     */

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

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

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

 

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

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

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

-			return false;

-		}

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

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

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

-			return false;

-		}

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

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

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

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

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

+            return false;

+        }

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

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

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

+            return false;

+        }

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

+        $this->appendDebug($this->varDump($opData));

 

-		// Get encoding style for output and set to current

-		$encodingStyle = 'http://schemas.xmlsoap.org/soap/encoding/';

-		if(($direction == 'input') && isset($opData['output']['encodingStyle']) && ($opData['output']['encodingStyle'] != $encodingStyle)) {

-			$encodingStyle = $opData['output']['encodingStyle'];

-			$enc_style = $encodingStyle;

-		}

+        // Get encoding style for output and set to current

+        $encodingStyle = 'http://schemas.xmlsoap.org/soap/encoding/';

+        if(($direction == 'input') && isset($opData['output']['encodingStyle']) && ($opData['output']['encodingStyle'] != $encodingStyle)) {

+            $encodingStyle = $opData['output']['encodingStyle'];

+            $enc_style = $encodingStyle;

+        }

 

-		// set input params

-		$xml = '';

-		if (isset($opData[$direction]['parts']) && sizeof($opData[$direction]['parts']) > 0) {

-			$parts = &$opData[$direction]['parts'];

-			$part_count = sizeof($parts);

-			$style = $opData['style'];

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

-			$this->debug("have $part_count part(s) to serialize using $style/$use");

-			if (is_array($parameters)) {

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

-				$parameter_count = count($parameters);

-				$this->debug("have $parameter_count parameter(s) provided as $parametersArrayType to serialize");

-				// check for Microsoft-style wrapped parameters

-				if ($style == 'document' && $use == 'literal' && $part_count == 1 && isset($parts['parameters'])) {

-					$this->debug('check whether the caller has wrapped the parameters');

-					if ($direction == 'output' && $parametersArrayType == 'arraySimple' && $parameter_count == 1) {

-						// TODO: consider checking here for double-wrapping, when

-						// service function wraps, then NuSOAP wraps again

-						$this->debug("change simple array to associative with 'parameters' element");

-						$parameters['parameters'] = $parameters[0];

-						unset($parameters[0]);

-					}

-					if (($parametersArrayType == 'arrayStruct' || $parameter_count == 0) && !isset($parameters['parameters'])) {

-						$this->debug('check whether caller\'s parameters match the wrapped ones');

-						if ($this->parametersMatchWrapped($parts['parameters'], $parameters)) {

-							$this->debug('wrap the parameters for the caller');

-							$parameters = array('parameters' => $parameters);

-							$parameter_count = 1;

-						}

-					}

-				}

-				foreach ($parts as $name => $type) {

-					$this->debug("serializing part $name of type $type");

-					// Track encoding style

-					if (isset($opData[$direction]['encodingStyle']) && $encodingStyle != $opData[$direction]['encodingStyle']) {

-						$encodingStyle = $opData[$direction]['encodingStyle'];

-						$enc_style = $encodingStyle;

-					} else {

-						$enc_style = false;

-					}

-					// NOTE: add error handling here

-					// if serializeType returns false, then catch global error and fault

-					if ($parametersArrayType == 'arraySimple') {

-						$p = array_shift($parameters);

-						$this->debug('calling serializeType w/indexed param');

-						$xml .= $this->serializeType($name, $type, $p, $use, $enc_style);

-					} elseif (isset($parameters[$name])) {

-						$this->debug('calling serializeType w/named param');

-						$xml .= $this->serializeType($name, $type, $parameters[$name], $use, $enc_style);

-					} else {

-						// TODO: only send nillable

-						$this->debug('calling serializeType w/null param');

-						$xml .= $this->serializeType($name, $type, null, $use, $enc_style);

-					}

-				}

-			} else {

-				$this->debug('no parameters passed.');

-			}

-		}

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

-		return $xml;

-	}

+        // set input params

+        $xml = '';

+        if (isset($opData[$direction]['parts']) && sizeof($opData[$direction]['parts']) > 0) {

+            $parts = &$opData[$direction]['parts'];

+            $part_count = sizeof($parts);

+            $style = $opData['style'];

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

+            $this->debug("have $part_count part(s) to serialize using $style/$use");

+            if (is_array($parameters)) {

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

+                $parameter_count = count($parameters);

+                $this->debug("have $parameter_count parameter(s) provided as $parametersArrayType to serialize");

+                // check for Microsoft-style wrapped parameters

+                if ($style == 'document' && $use == 'literal' && $part_count == 1 && isset($parts['parameters'])) {

+                    $this->debug('check whether the caller has wrapped the parameters');

+                    if ($direction == 'output' && $parametersArrayType == 'arraySimple' && $parameter_count == 1) {

+                        // TODO: consider checking here for double-wrapping, when

+                        // service function wraps, then NuSOAP wraps again

+                        $this->debug("change simple array to associative with 'parameters' element");

+                        $parameters['parameters'] = $parameters[0];

+                        unset($parameters[0]);

+                    }

+                    if (($parametersArrayType == 'arrayStruct' || $parameter_count == 0) && !isset($parameters['parameters'])) {

+                        $this->debug('check whether caller\'s parameters match the wrapped ones');

+                        if ($this->parametersMatchWrapped($parts['parameters'], $parameters)) {

+                            $this->debug('wrap the parameters for the caller');

+                            $parameters = array('parameters' => $parameters);

+                            $parameter_count = 1;

+                        }

+                    }

+                }

+                foreach ($parts as $name => $type) {

+                    $this->debug("serializing part $name of type $type");

+                    // Track encoding style

+                    if (isset($opData[$direction]['encodingStyle']) && $encodingStyle != $opData[$direction]['encodingStyle']) {

+                        $encodingStyle = $opData[$direction]['encodingStyle'];

+                        $enc_style = $encodingStyle;

+                    } else {

+                        $enc_style = false;

+                    }

+                    // NOTE: add error handling here

+                    // if serializeType returns false, then catch global error and fault

+                    if ($parametersArrayType == 'arraySimple') {

+                        $p = array_shift($parameters);

+                        $this->debug('calling serializeType w/indexed param');

+                        $xml .= $this->serializeType($name, $type, $p, $use, $enc_style);

+                    } elseif (isset($parameters[$name])) {

+                        $this->debug('calling serializeType w/named param');

+                        $xml .= $this->serializeType($name, $type, $parameters[$name], $use, $enc_style);

+                    } else {

+                        // TODO: only send nillable

+                        $this->debug('calling serializeType w/null param');

+                        $xml .= $this->serializeType($name, $type, null, $use, $enc_style);

+                    }

+                }

+            } else {

+                $this->debug('no parameters passed.');

+            }

+        }

+        $this->debug("serializeRPCParameters returning: $xml");

+        return $xml;

+    }

 

-	/**

-	 * serialize a PHP value according to a WSDL message definition

-	 *

-	 * TODO

-	 * - multi-ref serialization

-	 * - validate PHP values against type definitions, return errors if invalid

-	 *

-	 * @param string $operation operation name

-	 * @param string $direction (input|output)

-	 * @param mixed $parameters parameter value(s)

-	 * @return mixed parameters serialized as XML or false on error (e.g. operation not found)

-	 * @access public

-	 * @deprecated

-	 */

-	function serializeParameters($operation, $direction, $parameters)

-	{

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

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

+    /**

+     * serialize a PHP value according to a WSDL message definition

+     *

+     * TODO

+     * - multi-ref serialization

+     * - validate PHP values against type definitions, return errors if invalid

+     *

+     * @param string $operation operation name

+     * @param string $direction (input|output)

+     * @param mixed $parameters parameter value(s)

+     * @return mixed parameters serialized as XML or false on error (e.g. operation not found)

+     * @access public

+     * @deprecated

+     */

+    function serializeParameters($operation, $direction, $parameters)

+    {

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

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

 

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

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

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

-			return false;

-		}

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

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

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

-			return false;

-		}

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

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

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

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

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

+            return false;

+        }

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

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

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

+            return false;

+        }

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

+        $this->appendDebug($this->varDump($opData));

 

-		// Get encoding style for output and set to current

-		$encodingStyle = 'http://schemas.xmlsoap.org/soap/encoding/';

-		if(($direction == 'input') && isset($opData['output']['encodingStyle']) && ($opData['output']['encodingStyle'] != $encodingStyle)) {

-			$encodingStyle = $opData['output']['encodingStyle'];

-			$enc_style = $encodingStyle;

-		}

+        // Get encoding style for output and set to current

+        $encodingStyle = 'http://schemas.xmlsoap.org/soap/encoding/';

+        if(($direction == 'input') && isset($opData['output']['encodingStyle']) && ($opData['output']['encodingStyle'] != $encodingStyle)) {

+            $encodingStyle = $opData['output']['encodingStyle'];

+            $enc_style = $encodingStyle;

+        }

 

-		// set input params

-		$xml = '';

-		if (isset($opData[$direction]['parts']) && sizeof($opData[$direction]['parts']) > 0) {

+        // set input params

+        $xml = '';

+        if (isset($opData[$direction]['parts']) && sizeof($opData[$direction]['parts']) > 0) {

 

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

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

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

-			if (is_array($parameters)) {

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

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

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

-					$this->debug('serializing part "'.$name.'" of type "'.$type.'"');

-					// Track encoding style

-					if(isset($opData[$direction]['encodingStyle']) && $encodingStyle != $opData[$direction]['encodingStyle']) {

-						$encodingStyle = $opData[$direction]['encodingStyle'];

-						$enc_style = $encodingStyle;

-					} else {

-						$enc_style = false;

-					}

-					// NOTE: add error handling here

-					// if serializeType returns false, then catch global error and fault

-					if ($parametersArrayType == 'arraySimple') {

-						$p = array_shift($parameters);

-						$this->debug('calling serializeType w/indexed param');

-						$xml .= $this->serializeType($name, $type, $p, $use, $enc_style);

-					} elseif (isset($parameters[$name])) {

-						$this->debug('calling serializeType w/named param');

-						$xml .= $this->serializeType($name, $type, $parameters[$name], $use, $enc_style);

-					} else {

-						// TODO: only send nillable

-						$this->debug('calling serializeType w/null param');

-						$xml .= $this->serializeType($name, $type, null, $use, $enc_style);

-					}

-				}

-			} else {

-				$this->debug('no parameters passed.');

-			}

-		}

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

-		return $xml;

-	}

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

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

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

+            if (is_array($parameters)) {

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

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

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

+                    $this->debug('serializing part "'.$name.'" of type "'.$type.'"');

+                    // Track encoding style

+                    if(isset($opData[$direction]['encodingStyle']) && $encodingStyle != $opData[$direction]['encodingStyle']) {

+                        $encodingStyle = $opData[$direction]['encodingStyle'];

+                        $enc_style = $encodingStyle;

+                    } else {

+                        $enc_style = false;

+                    }

+                    // NOTE: add error handling here

+                    // if serializeType returns false, then catch global error and fault

+                    if ($parametersArrayType == 'arraySimple') {

+                        $p = array_shift($parameters);

+                        $this->debug('calling serializeType w/indexed param');

+                        $xml .= $this->serializeType($name, $type, $p, $use, $enc_style);

+                    } elseif (isset($parameters[$name])) {

+                        $this->debug('calling serializeType w/named param');

+                        $xml .= $this->serializeType($name, $type, $parameters[$name], $use, $enc_style);

+                    } else {

+                        // TODO: only send nillable

+                        $this->debug('calling serializeType w/null param');

+                        $xml .= $this->serializeType($name, $type, null, $use, $enc_style);

+                    }

+                }

+            } else {

+                $this->debug('no parameters passed.');

+            }

+        }

+        $this->debug("serializeParameters returning: $xml");

+        return $xml;

+    }

 

-	/**

-	 * serializes a PHP value according a given type definition

-	 *

-	 * @param string $name name of value (part or element)

-	 * @param string $type XML schema type of value (type or element)

-	 * @param mixed $value a native PHP value (parameter value)

-	 * @param string $use use for part (encoded|literal)

-	 * @param string $encodingStyle SOAP encoding style for the value (if different than the enclosing style)

-	 * @param boolean $unqualified a kludge for what should be XML namespace form handling

-	 * @return string value serialized as an XML string

-	 * @access private

-	 */

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

-	{

-		$this->debug("in serializeType: name=$name, type=$type, use=$use, encodingStyle=$encodingStyle, unqualified=" . ($unqualified ? "unqualified" : "qualified"));

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

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

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

-		}

+    /**

+     * serializes a PHP value according a given type definition

+     *

+     * @param string $name name of value (part or element)

+     * @param string $type XML schema type of value (type or element)

+     * @param mixed $value a native PHP value (parameter value)

+     * @param string $use use for part (encoded|literal)

+     * @param string $encodingStyle SOAP encoding style for the value (if different than the enclosing style)

+     * @param boolean $unqualified a kludge for what should be XML namespace form handling

+     * @return string value serialized as an XML string

+     * @access private

+     */

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

+    {

+        $this->debug("in serializeType: name=$name, type=$type, use=$use, encodingStyle=$encodingStyle, unqualified=" . ($unqualified ? "unqualified" : "qualified"));

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

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

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

+        }

 

-		// if a soapval has been supplied, let its type override the WSDL

-    	if (is_object($value) && get_class($value) == 'soapval') {

-    		if ($value->type_ns) {

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

-		    	$forceType = true;

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

-    		} elseif ($value->type) {

-	    		$type = $value->type;

-		    	$forceType = true;

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

-	    	} else {

-	    		$forceType = false;

-		    	$this->debug("in serializeType: soapval does not override type");

-	    	}

-	    	$attrs = $value->attributes;

-	    	$value = $value->value;

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

-	    	if ($attrs) {

-	    		if (!is_array($value)) {

-	    			$value['!'] = $value;

-	    		}

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

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

-	    		}

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

-		    }

+        // if a soapval has been supplied, let its type override the WSDL

+        if (is_object($value) && get_class($value) == 'soapval') {

+            if ($value->type_ns) {

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

+                $forceType = true;

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

+            } elseif ($value->type) {

+                $type = $value->type;

+                $forceType = true;

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

+            } else {

+                $forceType = false;

+                $this->debug("in serializeType: soapval does not override type");

+            }

+            $attrs = $value->attributes;

+            $value = $value->value;

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

+            if ($attrs) {

+                if (!is_array($value)) {

+                    $value['!'] = $value;

+                }

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

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

+                }

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

+            }

         } else {

-        	$forceType = false;

+            $forceType = false;

         }

 

-		$xml = '';

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

-			$uqType = substr($type, strrpos($type, ':') + 1);

-			$ns = substr($type, 0, strrpos($type, ':'));

-			$this->debug("in serializeType: got a prefixed type: $uqType, $ns");

-			if ($this->getNamespaceFromPrefix($ns)) {

-				$ns = $this->getNamespaceFromPrefix($ns);

-				$this->debug("in serializeType: expanded prefixed type: $uqType, $ns");

-			}

+        $xml = '';

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

+            $uqType = substr($type, strrpos($type, ':') + 1);

+            $ns = substr($type, 0, strrpos($type, ':'));

+            $this->debug("in serializeType: got a prefixed type: $uqType, $ns");

+            if ($this->getNamespaceFromPrefix($ns)) {

+                $ns = $this->getNamespaceFromPrefix($ns);

+                $this->debug("in serializeType: expanded prefixed type: $uqType, $ns");

+            }

 

-			if($ns == $this->XMLSchemaVersion || $ns == 'http://schemas.xmlsoap.org/soap/encoding/'){

-				$this->debug('in serializeType: type namespace indicates XML Schema or SOAP Encoding type');

-				if ($unqualified && $use == 'literal') {

-					$elementNS = " xmlns=\"\"";

-				} else {

-					$elementNS = '';

-				}

-				if (is_null($value)) {

-					if ($use == 'literal') {

-						// TODO: depends on minOccurs

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

-					} else {

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

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

-					}

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

-					return $xml;

-				}

-				if ($uqType == 'Array') {

-					// JBoss/Axis does this sometimes

-					return $this->serialize_val($value, $name, false, false, false, false, $use);

-				}

-		    	if ($uqType == 'boolean') {

-		    		if ((is_string($value) && $value == 'false') || (! $value)) {

-						$value = 'false';

-					} else {

-						$value = 'true';

-					}

-				}

-				if ($uqType == 'string' && gettype($value) == 'string') {

-					$value = $this->expandEntities($value);

-				}

-				if (($uqType == 'long' || $uqType == 'unsignedLong') && gettype($value) == 'double') {

-					$value = sprintf("%.0lf", $value);

-				}

-				// it's a scalar

-				// TODO: what about null/nil values?

-				// check type isn't a custom type extending xmlschema namespace

-				if (!$this->getTypeDef($uqType, $ns)) {

-					if ($use == 'literal') {

-						if ($forceType) {

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

-						} else {

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

-						}

-					} else {

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

-					}

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

-					return $xml;

-				}

-				$this->debug('custom type extends XML Schema or SOAP Encoding namespace (yuck)');

-			} else if ($ns == 'http://xml.apache.org/xml-soap') {

-				$this->debug('in serializeType: appears to be Apache SOAP type');

-				if ($uqType == 'Map') {

-					$tt_prefix = $this->getPrefixFromNamespace('http://xml.apache.org/xml-soap');

-					if (! $tt_prefix) {

-						$this->debug('in serializeType: Add namespace for Apache SOAP type');

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

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

-						// force this to be added to usedNamespaces

-						$tt_prefix = $this->getPrefixFromNamespace('http://xml.apache.org/xml-soap');

-					}

-					$contents = '';

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

-						$this->debug("serializing map element: key $k, value $v");

-						$contents .= '<item>';

-						$contents .= $this->serialize_val($k,'key',false,false,false,false,$use);

-						$contents .= $this->serialize_val($v,'value',false,false,false,false,$use);

-						$contents .= '</item>';

-					}

-					if ($use == 'literal') {

-						if ($forceType) {

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

-						} else {

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

-						}

-					} else {

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

-					}

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

-					return $xml;

-				}

-				$this->debug('in serializeType: Apache SOAP type, but only support Map');

-			}

-		} else {

-			// TODO: should the type be compared to types in XSD, and the namespace

-			// set to XSD if the type matches?

-			$this->debug("in serializeType: No namespace for type $type");

-			$ns = '';

-			$uqType = $type;

-		}

-		if(!$typeDef = $this->getTypeDef($uqType, $ns)){

-			$this->setError("$type ($uqType) is not a supported type.");

-			$this->debug("in serializeType: $type ($uqType) is not a supported type.");

-			return false;

-		} else {

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

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

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

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

-			}

-		}

-		if (!isset($typeDef['phpType'])) {

-			$this->setError("$type ($uqType) has no phpType.");

-			$this->debug("in serializeType: $type ($uqType) has no phpType.");

-			return false;

-		}

-		$phpType = $typeDef['phpType'];

-		$this->debug("in serializeType: uqType: $uqType, ns: $ns, phptype: $phpType, arrayType: " . (isset($typeDef['arrayType']) ? $typeDef['arrayType'] : '') );

-		// if php type == struct, map value to the <all> element names

-		if ($phpType == 'struct') {

-			if (isset($typeDef['typeClass']) && $typeDef['typeClass'] == 'element') {

-				$elementName = $uqType;

-				if (isset($typeDef['form']) && ($typeDef['form'] == 'qualified')) {

-					$elementNS = " xmlns=\"$ns\"";

-				} else {

-					$elementNS = " xmlns=\"\"";

-				}

-			} else {

-				$elementName = $name;

-				if ($unqualified) {

-					$elementNS = " xmlns=\"\"";

-				} else {

-					$elementNS = '';

-				}

-			}

-			if (is_null($value)) {

-				if ($use == 'literal') {

-					// TODO: depends on minOccurs and nillable

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

-				} else {

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

-				}

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

-				return $xml;

-			}

-			if (is_object($value)) {

-				$value = get_object_vars($value);

-			}

-			if (is_array($value)) {

-				$elementAttrs = $this->serializeComplexTypeAttributes($typeDef, $value, $ns, $uqType);

-				if ($use == 'literal') {

-					if ($forceType) {

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

-					} else {

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

-					}

-				} else {

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

-				}

+            if($ns == $this->XMLSchemaVersion || $ns == 'http://schemas.xmlsoap.org/soap/encoding/'){

+                $this->debug('in serializeType: type namespace indicates XML Schema or SOAP Encoding type');

+                if ($unqualified && $use == 'literal') {

+                    $elementNS = " xmlns=\"\"";

+                } else {

+                    $elementNS = '';

+                }

+                if (is_null($value)) {

+                    if ($use == 'literal') {

+                        // TODO: depends on minOccurs

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

+                    } else {

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

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

+                    }

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

+                    return $xml;

+                }

+                if ($uqType == 'Array') {

+                    // JBoss/Axis does this sometimes

+                    return $this->serialize_val($value, $name, false, false, false, false, $use);

+                }

+                if ($uqType == 'boolean') {

+                    if ((is_string($value) && $value == 'false') || (! $value)) {

+                        $value = 'false';

+                    } else {

+                        $value = 'true';

+                    }

+                }

+                if ($uqType == 'string' && gettype($value) == 'string') {

+                    $value = $this->expandEntities($value);

+                }

+                if (($uqType == 'long' || $uqType == 'unsignedLong') && gettype($value) == 'double') {

+                    $value = sprintf("%.0lf", $value);

+                }

+                // it's a scalar

+                // TODO: what about null/nil values?

+                // check type isn't a custom type extending xmlschema namespace

+                if (!$this->getTypeDef($uqType, $ns)) {

+                    if ($use == 'literal') {

+                        if ($forceType) {

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

+                        } else {

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

+                        }

+                    } else {

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

+                    }

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

+                    return $xml;

+                }

+                $this->debug('custom type extends XML Schema or SOAP Encoding namespace (yuck)');

+            } else if ($ns == 'http://xml.apache.org/xml-soap') {

+                $this->debug('in serializeType: appears to be Apache SOAP type');

+                if ($uqType == 'Map') {

+                    $tt_prefix = $this->getPrefixFromNamespace('http://xml.apache.org/xml-soap');

+                    if (! $tt_prefix) {

+                        $this->debug('in serializeType: Add namespace for Apache SOAP type');

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

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

+                        // force this to be added to usedNamespaces

+                        $tt_prefix = $this->getPrefixFromNamespace('http://xml.apache.org/xml-soap');

+                    }

+                    $contents = '';

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

+                        $this->debug("serializing map element: key $k, value $v");

+                        $contents .= '<item>';

+                        $contents .= $this->serialize_val($k,'key',false,false,false,false,$use);

+                        $contents .= $this->serialize_val($v,'value',false,false,false,false,$use);

+                        $contents .= '</item>';

+                    }

+                    if ($use == 'literal') {

+                        if ($forceType) {

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

+                        } else {

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

+                        }

+                    } else {

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

+                    }

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

+                    return $xml;

+                }

+                $this->debug('in serializeType: Apache SOAP type, but only support Map');

+            }

+        } else {

+            // TODO: should the type be compared to types in XSD, and the namespace

+            // set to XSD if the type matches?

+            $this->debug("in serializeType: No namespace for type $type");

+            $ns = '';

+            $uqType = $type;

+        }

+        if(!$typeDef = $this->getTypeDef($uqType, $ns)){

+            $this->setError("$type ($uqType) is not a supported type.");

+            $this->debug("in serializeType: $type ($uqType) is not a supported type.");

+            return false;

+        } else {

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

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

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

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

+            }

+        }

+        if (!isset($typeDef['phpType'])) {

+            $this->setError("$type ($uqType) has no phpType.");

+            $this->debug("in serializeType: $type ($uqType) has no phpType.");

+            return false;

+        }

+        $phpType = $typeDef['phpType'];

+        $this->debug("in serializeType: uqType: $uqType, ns: $ns, phptype: $phpType, arrayType: " . (isset($typeDef['arrayType']) ? $typeDef['arrayType'] : '') );

+        // if php type == struct, map value to the <all> element names

+        if ($phpType == 'struct') {

+            if (isset($typeDef['typeClass']) && $typeDef['typeClass'] == 'element') {

+                $elementName = $uqType;

+                if (isset($typeDef['form']) && ($typeDef['form'] == 'qualified')) {

+                    $elementNS = " xmlns=\"$ns\"";

+                } else {

+                    $elementNS = " xmlns=\"\"";

+                }

+            } else {

+                $elementName = $name;

+                if ($unqualified) {

+                    $elementNS = " xmlns=\"\"";

+                } else {

+                    $elementNS = '';

+                }

+            }

+            if (is_null($value)) {

+                if ($use == 'literal') {

+                    // TODO: depends on minOccurs and nillable

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

+                } else {

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

+                }

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

+                return $xml;

+            }

+            if (is_object($value)) {

+                $value = get_object_vars($value);

+            }

+            if (is_array($value)) {

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

+                if ($use == 'literal') {

+                    if ($forceType) {

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

+                    } else {

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

+                    }

+                } else {

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

+                }

 

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

-					if (isset($value['!'])) {

-						$xml .= $value['!'];

-						$this->debug("in serializeType: serialized simpleContent for type $type");

-					} else {

-						$this->debug("in serializeType: no simpleContent to serialize for type $type");

-					}

-				} else {

-					// complexContent

-					$xml .= $this->serializeComplexTypeElements($typeDef, $value, $ns, $uqType, $use, $encodingStyle);

-				}

-				$xml .= "</$elementName>";

-			} else {

-				$this->debug("in serializeType: phpType is struct, but value is not an array");

-				$this->setError("phpType is struct, but value is not an array: see debug output for details");

-				$xml = '';

-			}

-		} elseif ($phpType == 'array') {

-			if (isset($typeDef['form']) && ($typeDef['form'] == 'qualified')) {

-				$elementNS = " xmlns=\"$ns\"";

-			} else {

-				if ($unqualified) {

-					$elementNS = " xmlns=\"\"";

-				} else {

-					$elementNS = '';

-				}

-			}

-			if (is_null($value)) {

-				if ($use == 'literal') {

-					// TODO: depends on minOccurs

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

-				} else {

-					$xml = "<$name$elementNS xsi:nil=\"true\" xsi:type=\"" .

-						$this->getPrefixFromNamespace('http://schemas.xmlsoap.org/soap/encoding/') .

-						":Array\" " .

-						$this->getPrefixFromNamespace('http://schemas.xmlsoap.org/soap/encoding/') .

-						':arrayType="' .

-						$this->getPrefixFromNamespace($this->getPrefix($typeDef['arrayType'])) .

-						':' .

-						$this->getLocalPart($typeDef['arrayType'])."[0]\"/>";

-				}

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

-				return $xml;

-			}

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

-				$nv = array();

-				foreach($value as $v) {

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

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

-				}

-				$value = $nv;

-			} else {

-				$cols = '';

-			}

-			if (is_array($value) && sizeof($value) >= 1) {

-				$rows = sizeof($value);

-				$contents = '';

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

-					//$this->debug("serializing array element: $k, $v of type: $typeDef[arrayType]");

-					//if (strpos($typeDef['arrayType'], ':') ) {

-					if (!in_array($typeDef['arrayType'],$this->typemap['http://www.w3.org/2001/XMLSchema'])) {

-					    $contents .= $this->serializeType('item', $typeDef['arrayType'], $v, $use);

-					} else {

-					    $contents .= $this->serialize_val($v, 'item', $typeDef['arrayType'], null, $this->XMLSchemaVersion, false, $use);

-					}

-				}

-			} else {

-				$rows = 0;

-				$contents = null;

-			}

-			// TODO: for now, an empty value will be serialized as a zero element

-			// array.  Revisit this when coding the handling of null/nil values.

-			if ($use == 'literal') {

-				$xml = "<$name$elementNS>"

-					.$contents

-					."</$name>";

-			} else {

-				$xml = "<$name$elementNS xsi:type=\"".$this->getPrefixFromNamespace('http://schemas.xmlsoap.org/soap/encoding/').':Array" '.

-					$this->getPrefixFromNamespace('http://schemas.xmlsoap.org/soap/encoding/')

-					.':arrayType="'

-					.$this->getPrefixFromNamespace($this->getPrefix($typeDef['arrayType']))

-					.":".$this->getLocalPart($typeDef['arrayType'])."[$rows$cols]\">"

-					.$contents

-					."</$name>";

-			}

-		} elseif ($phpType == 'scalar') {

-			if (isset($typeDef['form']) && ($typeDef['form'] == 'qualified')) {

-				$elementNS = " xmlns=\"$ns\"";

-			} else {

-				if ($unqualified) {

-					$elementNS = " xmlns=\"\"";

-				} else {

-					$elementNS = '';

-				}

-			}

-			if ($use == 'literal') {

-				if ($forceType) {

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

-				} else {

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

-				}

-			} else {

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

-			}

-		}

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

-		return $xml;

-	}

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

+                    if (isset($value['!'])) {

+                        $xml .= $value['!'];

+                        $this->debug("in serializeType: serialized simpleContent for type $type");

+                    } else {

+                        $this->debug("in serializeType: no simpleContent to serialize for type $type");

+                    }

+                } else {

+                    // complexContent

+                    $xml .= $this->serializeComplexTypeElements($typeDef, $value, $ns, $uqType, $use, $encodingStyle);

+                }

+                $xml .= "</$elementName>";

+            } else {

+                $this->debug("in serializeType: phpType is struct, but value is not an array");

+                $this->setError("phpType is struct, but value is not an array: see debug output for details");

+                $xml = '';

+            }

+        } elseif ($phpType == 'array') {

+            if (isset($typeDef['form']) && ($typeDef['form'] == 'qualified')) {

+                $elementNS = " xmlns=\"$ns\"";

+            } else {

+                if ($unqualified) {

+                    $elementNS = " xmlns=\"\"";

+                } else {

+                    $elementNS = '';

+                }

+            }

+            if (is_null($value)) {

+                if ($use == 'literal') {

+                    // TODO: depends on minOccurs

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

+                } else {

+                    $xml = "<$name$elementNS xsi:nil=\"true\" xsi:type=\"" .

+                        $this->getPrefixFromNamespace('http://schemas.xmlsoap.org/soap/encoding/') .

+                        ":Array\" " .

+                        $this->getPrefixFromNamespace('http://schemas.xmlsoap.org/soap/encoding/') .

+                        ':arrayType="' .

+                        $this->getPrefixFromNamespace($this->getPrefix($typeDef['arrayType'])) .

+                        ':' .

+                        $this->getLocalPart($typeDef['arrayType'])."[0]\"/>";

+                }

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

+                return $xml;

+            }

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

+                $nv = array();

+                foreach($value as $v) {

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

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

+                }

+                $value = $nv;

+            } else {

+                $cols = '';

+            }

+            if (is_array($value) && sizeof($value) >= 1) {

+                $rows = sizeof($value);

+                $contents = '';

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

+                    //$this->debug("serializing array element: $k, $v of type: $typeDef[arrayType]");

+                    //if (strpos($typeDef['arrayType'], ':') ) {

+                    if (!in_array($typeDef['arrayType'],$this->typemap['http://www.w3.org/2001/XMLSchema'])) {

+                        $contents .= $this->serializeType('item', $typeDef['arrayType'], $v, $use);

+                    } else {

+                        $contents .= $this->serialize_val($v, 'item', $typeDef['arrayType'], null, $this->XMLSchemaVersion, false, $use);

+                    }

+                }

+            } else {

+                $rows = 0;

+                $contents = null;

+            }

+            // TODO: for now, an empty value will be serialized as a zero element

+            // array.  Revisit this when coding the handling of null/nil values.

+            if ($use == 'literal') {

+                $xml = "<$name$elementNS>"

+                    .$contents

+                    ."</$name>";

+            } else {

+                $xml = "<$name$elementNS xsi:type=\"".$this->getPrefixFromNamespace('http://schemas.xmlsoap.org/soap/encoding/').':Array" '.

+                    $this->getPrefixFromNamespace('http://schemas.xmlsoap.org/soap/encoding/')

+                    .':arrayType="'

+                    .$this->getPrefixFromNamespace($this->getPrefix($typeDef['arrayType']))

+                    .":".$this->getLocalPart($typeDef['arrayType'])."[$rows$cols]\">"

+                    .$contents

+                    ."</$name>";

+            }

+        } elseif ($phpType == 'scalar') {

+            if (isset($typeDef['form']) && ($typeDef['form'] == 'qualified')) {

+                $elementNS = " xmlns=\"$ns\"";

+            } else {

+                if ($unqualified) {

+                    $elementNS = " xmlns=\"\"";

+                } else {

+                    $elementNS = '';

+                }

+            }

+            if ($use == 'literal') {

+                if ($forceType) {

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

+                } else {

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

+                }

+            } else {

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

+            }

+        }

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

+        return $xml;

+    }

 

-	/**

-	 * serializes the attributes for a complexType

-	 *

-	 * @param array $typeDef our internal representation of an XML schema type (or element)

-	 * @param mixed $value a native PHP value (parameter value)

-	 * @param string $ns the namespace of the type

-	 * @param string $uqType the local part of the type

-	 * @return string value serialized as an XML string

-	 * @access private

-	 */

-	function serializeComplexTypeAttributes($typeDef, $value, $ns, $uqType) {

-		$this->debug("serializeComplexTypeAttributes for XML Schema type $ns:$uqType");

-		$xml = '';

-		if (isset($typeDef['extensionBase'])) {

-			$nsx = $this->getPrefix($typeDef['extensionBase']);

-			$uqTypex = $this->getLocalPart($typeDef['extensionBase']);

-			if ($this->getNamespaceFromPrefix($nsx)) {

-				$nsx = $this->getNamespaceFromPrefix($nsx);

-			}

-			if ($typeDefx = $this->getTypeDef($uqTypex, $nsx)) {

-				$this->debug("serialize attributes for extension base $nsx:$uqTypex");

-				$xml .= $this->serializeComplexTypeAttributes($typeDefx, $value, $nsx, $uqTypex);

-			} else {

-				$this->debug("extension base $nsx:$uqTypex is not a supported type");

-			}

-		}

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

-			$this->debug("serialize attributes for XML Schema type $ns:$uqType");

-			if (is_array($value)) {

-				$xvalue = $value;

-			} elseif (is_object($value)) {

-				$xvalue = get_object_vars($value);

-			} else {

-				$this->debug("value is neither an array nor an object for XML Schema type $ns:$uqType");

-				$xvalue = array();

-			}

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

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

-					$xname = '!' . $aName;

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

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

-					$xname = $aName;

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

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

-					$xname = '!' . $aName;

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

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

-				} else {

-					$xname = '';

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

-				}

-				if ($xname) {

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

-				}

-			}

-		} else {

-			$this->debug("no attributes to serialize for XML Schema type $ns:$uqType");

-		}

-		return $xml;

-	}

+    /**

+     * serializes the attributes for a complexType

+     *

+     * @param array $typeDef our internal representation of an XML schema type (or element)

+     * @param mixed $value a native PHP value (parameter value)

+     * @param string $ns the namespace of the type

+     * @param string $uqType the local part of the type

+     * @return string value serialized as an XML string

+     * @access private

+     */

+    function serializeComplexTypeAttributes($typeDef, $value, $ns, $uqType) {

+        $this->debug("serializeComplexTypeAttributes for XML Schema type $ns:$uqType");

+        $xml = '';

+        if (isset($typeDef['extensionBase'])) {

+            $nsx = $this->getPrefix($typeDef['extensionBase']);

+            $uqTypex = $this->getLocalPart($typeDef['extensionBase']);

+            if ($this->getNamespaceFromPrefix($nsx)) {

+                $nsx = $this->getNamespaceFromPrefix($nsx);

+            }

+            if ($typeDefx = $this->getTypeDef($uqTypex, $nsx)) {

+                $this->debug("serialize attributes for extension base $nsx:$uqTypex");

+                $xml .= $this->serializeComplexTypeAttributes($typeDefx, $value, $nsx, $uqTypex);

+            } else {

+                $this->debug("extension base $nsx:$uqTypex is not a supported type");

+            }

+        }

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

+            $this->debug("serialize attributes for XML Schema type $ns:$uqType");

+            if (is_array($value)) {

+                $xvalue = $value;

+            } elseif (is_object($value)) {

+                $xvalue = get_object_vars($value);

+            } else {

+                $this->debug("value is neither an array nor an object for XML Schema type $ns:$uqType");

+                $xvalue = array();

+            }

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

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

+                    $xname = '!' . $aName;

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

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

+                    $xname = $aName;

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

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

+                    $xname = '!' . $aName;

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

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

+                } else {

+                    $xname = '';

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

+                }

+                if ($xname) {

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

+                }

+            }

+        } else {

+            $this->debug("no attributes to serialize for XML Schema type $ns:$uqType");

+        }

+        return $xml;

+    }

 

-	/**

-	 * serializes the elements for a complexType

-	 *

-	 * @param array $typeDef our internal representation of an XML schema type (or element)

-	 * @param mixed $value a native PHP value (parameter value)

-	 * @param string $ns the namespace of the type

-	 * @param string $uqType the local part of the type

-	 * @param string $use use for part (encoded|literal)

-	 * @param string $encodingStyle SOAP encoding style for the value (if different than the enclosing style)

-	 * @return string value serialized as an XML string

-	 * @access private

-	 */

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

-		$this->debug("in serializeComplexTypeElements for XML Schema type $ns:$uqType");

-		$xml = '';

-		if (isset($typeDef['extensionBase'])) {

-			$nsx = $this->getPrefix($typeDef['extensionBase']);

-			$uqTypex = $this->getLocalPart($typeDef['extensionBase']);

-			if ($this->getNamespaceFromPrefix($nsx)) {

-				$nsx = $this->getNamespaceFromPrefix($nsx);

-			}

-			if ($typeDefx = $this->getTypeDef($uqTypex, $nsx)) {

-				$this->debug("serialize elements for extension base $nsx:$uqTypex");

-				$xml .= $this->serializeComplexTypeElements($typeDefx, $value, $nsx, $uqTypex, $use, $encodingStyle);

-			} else {

-				$this->debug("extension base $nsx:$uqTypex is not a supported type");

-			}

-		}

-		if (isset($typeDef['elements']) && is_array($typeDef['elements'])) {

-			$this->debug("in serializeComplexTypeElements, serialize elements for XML Schema type $ns:$uqType");

-			if (is_array($value)) {

-				$xvalue = $value;

-			} elseif (is_object($value)) {

-				$xvalue = get_object_vars($value);

-			} else {

-				$this->debug("value is neither an array nor an object for XML Schema type $ns:$uqType");

-				$xvalue = array();

-			}

-			// toggle whether all elements are present - ideally should validate against schema

-			if (count($typeDef['elements']) != count($xvalue)){

-				$optionals = true;

-			}

-			foreach ($typeDef['elements'] as $eName => $attrs) {

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

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

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

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

-					}

-				}

-				// if user took advantage of a minOccurs=0, then only serialize named parameters

-				if (isset($optionals)

-				    && (!isset($xvalue[$eName]))

-					&& ( (!isset($attrs['nillable'])) || $attrs['nillable'] != 'true')

-					){

-					if (isset($attrs['minOccurs']) && $attrs['minOccurs'] <> '0') {

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

-					}

-					// do nothing

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

-				} else {

-					// get value

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

-					    $v = $xvalue[$eName];

-					} else {

-					    $v = null;

-					}

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

-						$unqualified = ($attrs['form'] == 'unqualified');

-					} else {

-						$unqualified = false;

-					}

-					if (isset($attrs['maxOccurs']) && ($attrs['maxOccurs'] == 'unbounded' || $attrs['maxOccurs'] > 1) && isset($v) && is_array($v) && $this->isArraySimpleOrStruct($v) == 'arraySimple') {

-						$vv = $v;

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

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

-								// serialize schema-defined type

-							    $xml .= $this->serializeType($eName, isset($attrs['type']) ? $attrs['type'] : $attrs['ref'], $v, $use, $encodingStyle, $unqualified);

-							} else {

-								// serialize generic type (can this ever really happen?)

-							    $this->debug("calling serialize_val() for $v, $eName, false, false, false, false, $use");

-							    $xml .= $this->serialize_val($v, $eName, false, false, false, false, $use);

-							}

-						}

-					} else {

-						if (is_null($v) && isset($attrs['minOccurs']) && $attrs['minOccurs'] == '0') {

-							// do nothing

-						} elseif (is_null($v) && isset($attrs['nillable']) && $attrs['nillable'] == 'true') {

-							// TODO: serialize a nil correctly, but for now serialize schema-defined type

-						    $xml .= $this->serializeType($eName, isset($attrs['type']) ? $attrs['type'] : $attrs['ref'], $v, $use, $encodingStyle, $unqualified);

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

-							// serialize schema-defined type

-						    $xml .= $this->serializeType($eName, isset($attrs['type']) ? $attrs['type'] : $attrs['ref'], $v, $use, $encodingStyle, $unqualified);

-						} else {

-							// serialize generic type (can this ever really happen?)

-						    $this->debug("calling serialize_val() for $v, $eName, false, false, false, false, $use");

-						    $xml .= $this->serialize_val($v, $eName, false, false, false, false, $use);

-						}

-					}

-				}

-			}

-		} else {

-			$this->debug("no elements to serialize for XML Schema type $ns:$uqType");

-		}

-		return $xml;

-	}

+    /**

+     * serializes the elements for a complexType

+     *

+     * @param array $typeDef our internal representation of an XML schema type (or element)

+     * @param mixed $value a native PHP value (parameter value)

+     * @param string $ns the namespace of the type

+     * @param string $uqType the local part of the type

+     * @param string $use use for part (encoded|literal)

+     * @param string $encodingStyle SOAP encoding style for the value (if different than the enclosing style)

+     * @return string value serialized as an XML string

+     * @access private

+     */

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

+        $this->debug("in serializeComplexTypeElements for XML Schema type $ns:$uqType");

+        $xml = '';

+        if (isset($typeDef['extensionBase'])) {

+            $nsx = $this->getPrefix($typeDef['extensionBase']);

+            $uqTypex = $this->getLocalPart($typeDef['extensionBase']);

+            if ($this->getNamespaceFromPrefix($nsx)) {

+                $nsx = $this->getNamespaceFromPrefix($nsx);

+            }

+            if ($typeDefx = $this->getTypeDef($uqTypex, $nsx)) {

+                $this->debug("serialize elements for extension base $nsx:$uqTypex");

+                $xml .= $this->serializeComplexTypeElements($typeDefx, $value, $nsx, $uqTypex, $use, $encodingStyle);

+            } else {

+                $this->debug("extension base $nsx:$uqTypex is not a supported type");

+            }

+        }

+        if (isset($typeDef['elements']) && is_array($typeDef['elements'])) {

+            $this->debug("in serializeComplexTypeElements, serialize elements for XML Schema type $ns:$uqType");

+            if (is_array($value)) {

+                $xvalue = $value;

+            } elseif (is_object($value)) {

+                $xvalue = get_object_vars($value);

+            } else {

+                $this->debug("value is neither an array nor an object for XML Schema type $ns:$uqType");

+                $xvalue = array();

+            }

+            // toggle whether all elements are present - ideally should validate against schema

+            if (count($typeDef['elements']) != count($xvalue)){

+                $optionals = true;

+            }

+            foreach ($typeDef['elements'] as $eName => $attrs) {

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

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

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

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

+                    }

+                }

+                // if user took advantage of a minOccurs=0, then only serialize named parameters

+                if (isset($optionals)

+                    && (!isset($xvalue[$eName]))

+                    && ( (!isset($attrs['nillable'])) || $attrs['nillable'] != 'true')

+                    ){

+                    if (isset($attrs['minOccurs']) && $attrs['minOccurs'] <> '0') {

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

+                    }

+                    // do nothing

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

+                } else {

+                    // get value

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

+                        $v = $xvalue[$eName];

+                    } else {

+                        $v = null;

+                    }

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

+                        $unqualified = ($attrs['form'] == 'unqualified');

+                    } else {

+                        $unqualified = false;

+                    }

+                    if (isset($attrs['maxOccurs']) && ($attrs['maxOccurs'] == 'unbounded' || $attrs['maxOccurs'] > 1) && isset($v) && is_array($v) && $this->isArraySimpleOrStruct($v) == 'arraySimple') {

+                        $vv = $v;

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

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

+                                // serialize schema-defined type

+                                $xml .= $this->serializeType($eName, isset($attrs['type']) ? $attrs['type'] : $attrs['ref'], $v, $use, $encodingStyle, $unqualified);

+                            } else {

+                                // serialize generic type (can this ever really happen?)

+                                $this->debug("calling serialize_val() for $v, $eName, false, false, false, false, $use");

+                                $xml .= $this->serialize_val($v, $eName, false, false, false, false, $use);

+                            }

+                        }

+                    } else {

+                        if (is_null($v) && isset($attrs['minOccurs']) && $attrs['minOccurs'] == '0') {

+                            // do nothing

+                        } elseif (is_null($v) && isset($attrs['nillable']) && $attrs['nillable'] == 'true') {

+                            // TODO: serialize a nil correctly, but for now serialize schema-defined type

+                            $xml .= $this->serializeType($eName, isset($attrs['type']) ? $attrs['type'] : $attrs['ref'], $v, $use, $encodingStyle, $unqualified);

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

+                            // serialize schema-defined type

+                            $xml .= $this->serializeType($eName, isset($attrs['type']) ? $attrs['type'] : $attrs['ref'], $v, $use, $encodingStyle, $unqualified);

+                        } else {

+                            // serialize generic type (can this ever really happen?)

+                            $this->debug("calling serialize_val() for $v, $eName, false, false, false, false, $use");

+                            $xml .= $this->serialize_val($v, $eName, false, false, false, false, $use);

+                        }

+                    }

+                }

+            }

+        } else {

+            $this->debug("no elements to serialize for XML Schema type $ns:$uqType");

+        }

+        return $xml;

+    }

 

-	/**

-	* adds an XML Schema complex type to the WSDL types

-	*

-	* @param string	$name

-	* @param string $typeClass (complexType|simpleType|attribute)

-	* @param string $phpType currently supported are array and struct (php assoc array)

-	* @param string $compositor (all|sequence|choice)

-	* @param string $restrictionBase namespace:name (http://schemas.xmlsoap.org/soap/encoding/:Array)

-	* @param array $elements e.g. array ( name => array(name=>'',type=>'') )

-	* @param array $attrs e.g. array(array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType'=>'xsd:string[]'))

-	* @param string $arrayType as namespace:name (xsd:string)

-	* @see nusoap_xmlschema

-	* @access public

-	*/

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

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

-			$eElements = array();

-	    	foreach($elements as $n => $e){

-	            // expand each element

-	            $ee = array();

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

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

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

-		            $ee[$k] = $v;

-		    	}

-	    		$eElements[$n] = $ee;

-	    	}

-	    	$elements = $eElements;

-		}

+    /**

+     * adds an XML Schema complex type to the WSDL types

+     *

+     * @param string	$name

+     * @param string $typeClass (complexType|simpleType|attribute)

+     * @param string $phpType currently supported are array and struct (php assoc array)

+     * @param string $compositor (all|sequence|choice)

+     * @param string $restrictionBase namespace:name (http://schemas.xmlsoap.org/soap/encoding/:Array)

+     * @param array $elements e.g. array ( name => array(name=>'',type=>'') )

+     * @param array $attrs e.g. array(array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType'=>'xsd:string[]'))

+     * @param string $arrayType as namespace:name (xsd:string)

+     * @see nusoap_xmlschema

+     * @access public

+     */

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

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

+            $eElements = array();

+            foreach($elements as $n => $e){

+                // expand each element

+                $ee = array();

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

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

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

+                    $ee[$k] = $v;

+                }

+                $eElements[$n] = $ee;

+            }

+            $elements = $eElements;

+        }

 

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

-	    	foreach($attrs as $n => $a){

-	            // expand each attribute

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

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

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

-		            $aa[$k] = $v;

-		    	}

-	    		$eAttrs[$n] = $aa;

-	    	}

-	    	$attrs = $eAttrs;

-		}

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

+            foreach($attrs as $n => $a){

+                // expand each attribute

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

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

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

+                    $aa[$k] = $v;

+                }

+                $eAttrs[$n] = $aa;

+            }

+            $attrs = $eAttrs;

+        }

 

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

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

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

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

 

-		$typens = isset($this->namespaces['types']) ? $this->namespaces['types'] : $this->namespaces['tns'];

-		$this->schemas[$typens][0]->addComplexType($name,$typeClass,$phpType,$compositor,$restrictionBase,$elements,$attrs,$arrayType);

-	}

+        $typens = isset($this->namespaces['types']) ? $this->namespaces['types'] : $this->namespaces['tns'];

+        $this->schemas[$typens][0]->addComplexType($name,$typeClass,$phpType,$compositor,$restrictionBase,$elements,$attrs,$arrayType);

+    }

 

-	/**

-	* adds an XML Schema simple type to the WSDL types

-	*

-	* @param string $name

-	* @param string $restrictionBase namespace:name (http://schemas.xmlsoap.org/soap/encoding/:Array)

-	* @param string $typeClass (should always be simpleType)

-	* @param string $phpType (should always be scalar)

-	* @param array $enumeration array of values

-	* @see nusoap_xmlschema

-	* @access public

-	*/

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

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

+    /**

+     * adds an XML Schema simple type to the WSDL types

+     *

+     * @param string $name

+     * @param string $restrictionBase namespace:name (http://schemas.xmlsoap.org/soap/encoding/:Array)

+     * @param string $typeClass (should always be simpleType)

+     * @param string $phpType (should always be scalar)

+     * @param array $enumeration array of values

+     * @see nusoap_xmlschema

+     * @access public

+     */

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

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

 

-		$typens = isset($this->namespaces['types']) ? $this->namespaces['types'] : $this->namespaces['tns'];

-		$this->schemas[$typens][0]->addSimpleType($name, $restrictionBase, $typeClass, $phpType, $enumeration);

-	}

+        $typens = isset($this->namespaces['types']) ? $this->namespaces['types'] : $this->namespaces['tns'];

+        $this->schemas[$typens][0]->addSimpleType($name, $restrictionBase, $typeClass, $phpType, $enumeration);

+    }

 

-	/**

-	* adds an element to the WSDL types

-	*

-	* @param array $attrs attributes that must include name and type

-	* @see nusoap_xmlschema

-	* @access public

-	*/

-	function addElement($attrs) {

-		$typens = isset($this->namespaces['types']) ? $this->namespaces['types'] : $this->namespaces['tns'];

-		$this->schemas[$typens][0]->addElement($attrs);

-	}

+    /**

+     * adds an element to the WSDL types

+     *

+     * @param array $attrs attributes that must include name and type

+     * @see nusoap_xmlschema

+     * @access public

+     */

+    function addElement($attrs) {

+        $typens = isset($this->namespaces['types']) ? $this->namespaces['types'] : $this->namespaces['tns'];

+        $this->schemas[$typens][0]->addElement($attrs);

+    }

 

-	/**

-	* register an operation with the server

-	*

-	* @param string $name operation (method) name

-	* @param array $in assoc array of input values: key = param name, value = param type

-	* @param array $out assoc array of output values: key = param name, value = param type

-	* @param string $namespace optional The namespace for the operation

-	* @param string $soapaction optional The soapaction for the operation

-	* @param string $style (rpc|document) optional The style for the operation Note: when 'document' is specified, parameter and return wrappers are created for you automatically

-	* @param string $use (encoded|literal) optional The use for the parameters (cannot mix right now)

-	* @param string $documentation optional The description to include in the WSDL

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

-	* @access public

-	*/

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

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

-			$encodingStyle = 'http://schemas.xmlsoap.org/soap/encoding/';

-		}

+    /**

+     * register an operation with the server

+     *

+     * @param string $name operation (method) name

+     * @param array $in assoc array of input values: key = param name, value = param type

+     * @param array $out assoc array of output values: key = param name, value = param type

+     * @param string $namespace optional The namespace for the operation

+     * @param string $soapaction optional The soapaction for the operation

+     * @param string $style (rpc|document) optional The style for the operation Note: when 'document' is specified, parameter and return wrappers are created for you automatically

+     * @param string $use (encoded|literal) optional The use for the parameters (cannot mix right now)

+     * @param string $documentation optional The description to include in the WSDL

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

+     * @access public

+     */

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

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

+            $encodingStyle = 'http://schemas.xmlsoap.org/soap/encoding/';

+        }

 

-		if ($style == 'document') {

-			$elements = array();

-			foreach ($in as $n => $t) {

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

-			}

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

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

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

+        if ($style == 'document') {

+            $elements = array();

+            foreach ($in as $n => $t) {

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

+            }

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

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

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

 

-			$elements = array();

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

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

-			}

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

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

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

-		}

+            $elements = array();

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

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

+            }

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

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

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

+        }

 

-		// get binding

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

-		array(

-		'name' => $name,

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

-		'endpoint' => $this->endpoint,

-		'soapAction' => $soapaction,

-		'style' => $style,

-		'input' => array(

-			'use' => $use,

-			'namespace' => $namespace,

-			'encodingStyle' => $encodingStyle,

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

-			'parts' => $in),

-		'output' => array(

-			'use' => $use,

-			'namespace' => $namespace,

-			'encodingStyle' => $encodingStyle,

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

-			'parts' => $out),

-		'namespace' => $namespace,

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

-		'documentation' => $documentation);

-		// add portTypes

-		// add messages

-		if($in)

-		{

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

-			{

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

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

-				}

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

-			}

-		} else {

+        // get binding

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

+        array(

+        'name' => $name,

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

+        'endpoint' => $this->endpoint,

+        'soapAction' => $soapaction,

+        'style' => $style,

+        'input' => array(

+            'use' => $use,

+            'namespace' => $namespace,

+            'encodingStyle' => $encodingStyle,

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

+            'parts' => $in),

+        'output' => array(

+            'use' => $use,

+            'namespace' => $namespace,

+            'encodingStyle' => $encodingStyle,

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

+            'parts' => $out),

+        'namespace' => $namespace,

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

+        'documentation' => $documentation);

+        // add portTypes

+        // add messages

+        if($in)

+        {

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

+            {

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

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

+                }

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

+            }

+        } else {

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

         }

-		if($out)

-		{

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

-			{

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

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

-				}

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

-			}

-		} else {

+        if($out)

+        {

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

+            {

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

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

+                }

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

+            }

+        } else {

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

         }

-		return true;

-	}

+        return true;

+    }

 }

 

 ?>