chamilo / chamilo-lms

main/inc/lib/events_email.class.php

Spacing +14 added lines, -14 removed lines

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

main/inc/lib/event_email_template.class.php

Indentation +11 added lines, -11 removed lines

@@ -12,10 +12,10 @@ 
     /**
      * Constructor
      */
-	public function __construct()
+    public function __construct()
     {
         $this->table =  Database::get_main_table(TABLE_EVENT_EMAIL_TEMPLATE);
-	}
+    }
 
     public function get_all($where_conditions = array())
     {
@@ -29,19 +29,19 @@ 
     /**
      * Displays the title + grid
      */
-	public function display()
+    public function display()
     {
-		// action links
-		$content = Display::actions(array(
+        // action links
+        $content = Display::actions(array(
                 array(
                     'url' => 'event_type.php' ,
                     'content' => Display::return_icon('new_document.png', get_lang('Add'), array(), ICON_SIZE_MEDIUM)
-                 )
+                    )
             )
         );
         $content .= Display::grid_html('event_email_template');
         return $content;
-	}
+    }
 
     public function get_status_list()
     {
@@ -82,7 +82,7 @@ 
                 'Height' => '250',
             )
         );
-	    $status_list = $this->get_status_list();
+        $status_list = $this->get_status_list();
         $form->addElement('select', 'status', get_lang('Status'), $status_list);
         if ($action == 'edit') {
             $form->addElement('text', 'created_at', get_lang('CreatedAt'));
@@ -99,17 +99,17 @@ 
         $defaults = $this->get($id);
 
         if (!empty($defaults['created_at'])) {
-        	$defaults['created_at'] = api_convert_and_format_date($defaults['created_at']);
+            $defaults['created_at'] = api_convert_and_format_date($defaults['created_at']);
         }
         if (!empty($defaults['updated_at'])) {
-        	$defaults['updated_at'] = api_convert_and_format_date($defaults['updated_at']);
+            $defaults['updated_at'] = api_convert_and_format_date($defaults['updated_at']);
         }
         $form->setDefaults($defaults);
 
         // Setting the rules
         $form->addRule('name', get_lang('ThisFieldIsRequired'), 'required');
 
-		return $form;
+        return $form;
     }
 
     public function get_count()

Spacing +3 added lines, -3 removed lines

@@ -14,7 +14,7 @@ 
      */
 	public function __construct()
     {
-        $this->table =  Database::get_main_table(TABLE_EVENT_EMAIL_TEMPLATE);
+        $this->table = Database::get_main_table(TABLE_EVENT_EMAIL_TEMPLATE);
 	}
 
     /**
@@ -38,7 +38,7 @@ 
 		// action links
 		$content = Display::actions(array(
                 array(
-                    'url' => 'event_type.php' ,
+                    'url' => 'event_type.php',
                     'content' => Display::return_icon('new_document.png', get_lang('Add'), array(), ICON_SIZE_MEDIUM)
                  )
             )
@@ -121,7 +121,7 @@ 
 
     public function get_count()
     {
-        $row = Database::select('count(*) as count', $this->table, array(),'first');
+        $row = Database::select('count(*) as count', $this->table, array(), 'first');
 
         return $row['count'];
     }

main/inc/lib/myspace.lib.php

Braces +3 added lines, -1 removed lines

@@ -2097,7 +2097,9 @@
                 FROM $tbl_course course
                 WHERE course.code IN (".implode(',',$courses_code).")";
 
-        if (!in_array($direction, array('ASC','DESC'))) $direction = 'ASC';
+        if (!in_array($direction, array('ASC','DESC'))) {
+            $direction = 'ASC';
+        }
 
         $column = intval($column);
         $from = intval($from);

Spacing +103 added lines, -103 removed lines

@@ -134,7 +134,7 @@ 
         $session_id  = intval($session_id);
 
         $sql = 'SELECT login_course_date, logout_course_date
-                FROM ' . $tbl_track_course . '
+                FROM ' . $tbl_track_course.'
                 WHERE
                     user_id = '.$user_id.' AND
                     c_id = '.$courseId.' AND
@@ -173,7 +173,7 @@ 
         foreach ($course_list as $course_item) {
             $courseInfo = api_get_course_info($course_item['code']);
             $courseId = $courseInfo['real_id'];
-            $new_course_list[] =  '"'.$courseId.'"';
+            $new_course_list[] = '"'.$courseId.'"';
         }
         $course_list = implode(', ', $new_course_list);
 
@@ -181,7 +181,7 @@ 
             return false;
         }
         $sql = 'SELECT login_course_date, logout_course_date, c_id
-                FROM ' . $tbl_track_course . '
+                FROM ' . $tbl_track_course.'
                 WHERE
                     user_id = '.$user_id.' AND
                     c_id IN ('.$course_list.') AND
@@ -259,7 +259,7 @@ 
             // student score
             $avg_score = Tracking :: get_avg_student_score($user_id, $courseCode);
             if (is_numeric($avg_score)) {
-                $avg_score = round($avg_score,2);
+                $avg_score = round($avg_score, 2);
             } else {
                 $$avg_score = '-';
             }
@@ -295,7 +295,7 @@ 
 
         $t_head = '    <table style="width: 100%;border:0;padding:0;border-collapse:collapse;table-layout: fixed">';
         //$t_head .= '  <caption>'.get_lang('CourseInformation').'</caption>';
-        $t_head .=      '<tr>';
+        $t_head .= '<tr>';
         $t_head .= '        <th width="155px" style="border-left:0;border-bottom:0"><span>'.get_lang('Course').'</span></th>';
         $t_head .= '        <th style="padding:0;border-bottom:0"><span>'.cut(get_lang('AvgTimeSpentInTheCourse'), 6, true).'</span></th>';
         $t_head .= '        <th style="padding:0;border-bottom:0"><span>'.cut(get_lang('AvgStudentsProgress'), 6, true).'</span></th>';
@@ -313,7 +313,7 @@ 
 
         $addparams = array('view' => 'admin', 'display' => 'user');
 
-        $table = new SortableTable('tracking_user_overview', array('MySpace','get_number_of_users_tracking_overview'), array('MySpace','get_user_data_tracking_overview'), 0);
+        $table = new SortableTable('tracking_user_overview', array('MySpace', 'get_number_of_users_tracking_overview'), array('MySpace', 'get_user_data_tracking_overview'), 0);
         $table->additional_parameters = $addparams;
 
         $table->set_header(0, get_lang('OfficialCode'), true, array('style' => 'font-size:8pt'), array('style' => 'font-size:8pt'));
@@ -326,7 +326,7 @@ 
         }
         $table->set_header(3, get_lang('LoginName'), true, array('style' => 'font-size:8pt'), array('style' => 'font-size:8pt'));
         $table->set_header(4, $t_head, false, array('style' => 'width:90%;border:0;padding:0;font-size:7.5pt;'), array('style' => 'width:90%;padding:0;font-size:7.5pt;'));
-        $table->set_column_filter(4, array('MySpace','course_info_tracking_filter'));
+        $table->set_column_filter(4, array('MySpace', 'course_info_tracking_filter'));
         $table->display();
     }
 
@@ -386,7 +386,7 @@ 
         $table -> set_header(7, get_lang('Sessions'), false);
 
         if ($is_western_name_order) {
-            $csv_header[] = array (
+            $csv_header[] = array(
                 get_lang('FirstName'),
                 get_lang('LastName'),
                 get_lang('TimeSpentOnThePlatform'),
@@ -396,7 +396,7 @@ 
                 get_lang('NumberOfSessions')
             );
         } else {
-            $csv_header[] = array (
+            $csv_header[] = array(
                 get_lang('LastName'),
                 get_lang('FirstName'),
                 get_lang('TimeSpentOnThePlatform'),
@@ -536,9 +536,9 @@ 
 
         if ($tracking_column != 3) {
             if ($tracking_direction == 'DESC') {
-                usort($all_datas, array('MySpace','rsort_users'));
+                usort($all_datas, array('MySpace', 'rsort_users'));
             } else {
-                usort($all_datas, array('MySpace','sort_users'));
+                usort($all_datas, array('MySpace', 'sort_users'));
             }
         }
 
@@ -597,7 +597,7 @@ 
         /**
          * Column config
          */
-        $column_model   = array(
+        $column_model = array(
             array(
                 'name' => 'username',
                 'index' => 'username',
@@ -638,7 +638,7 @@ 
 
         $action_links = '';
         // jqgrid will use this URL to do the selects
-        $url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_session_lp_progress&session_id=' . $sessionId . '&course_id=' . $courseId . '&date_to=' . $date_to . '&date_from=' . $date_from;
+        $url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_session_lp_progress&session_id='.$sessionId.'&course_id='.$courseId.'&date_to='.$date_to.'&date_from='.$date_from;
 
         //Table Id
         $tableId = 'lpProgress';
@@ -660,11 +660,11 @@ 
             true
         );
 
-        $return = '<script>$(function() {'. $table .
+        $return = '<script>$(function() {'.$table.
             'jQuery("#'.$tableId.'").jqGrid("navGrid","#'.$tableId.'_pager",{view:false, edit:false, add:false, del:false, search:false, excel:true});
                 jQuery("#'.$tableId.'").jqGrid("navButtonAdd","#'.$tableId.'_pager",{
                        caption:"",
-                       title:"' . get_lang('ExportExcel') . '",
+                       title:"' . get_lang('ExportExcel').'",
                        onClickButton : function () {
                            jQuery("#'.$tableId.'").jqGrid("excelExport",{"url":"'.$url.'&export_format=xls"});
                        }
@@ -714,7 +714,7 @@ 
         /**
          * Column config
          */
-        $column_model   = array(
+        $column_model = array(
             array('name'=>'session', 'index'=>'session', 'align'=>'left', 'search' => 'true', 'wrap_cell' => "true"),
             array('name'=>'exercise_id', 'index'=>'exercise_id', 'align'=>'left', 'search' => 'true'),
             array('name'=>'quiz_title', 'index'=>'quiz_title', 'align'=>'left', 'search' => 'true'),
@@ -731,7 +731,7 @@ 
         //get dynamic column names
 
         // jqgrid will use this URL to do the selects
-        $url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_exercise_progress&session_id=' . $sessionId . '&course_id=' . $courseId  . '&exercise_id=' . $exerciseId . '&date_to=' . $date_to . '&date_from=' . $date_from;
+        $url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_exercise_progress&session_id='.$sessionId.'&course_id='.$courseId.'&exercise_id='.$exerciseId.'&date_to='.$date_to.'&date_from='.$date_from;
 
         // Autowidth
         $extra_params['autowidth'] = 'true';
@@ -742,11 +742,11 @@ 
         $tableId = 'exerciseProgressOverview';
         $table = Display::grid_js($tableId, $url, $columns, $column_model, $extra_params, array(), '', true);
 
-        $return = '<script>$(function() {'. $table .
+        $return = '<script>$(function() {'.$table.
             'jQuery("#'.$tableId.'").jqGrid("navGrid","#'.$tableId.'_pager",{view:false, edit:false, add:false, del:false, search:false, excel:true});
                 jQuery("#'.$tableId.'").jqGrid("navButtonAdd","#'.$tableId.'_pager",{
                        caption:"",
-                       title:"' . get_lang('ExportExcel') . '",
+                       title:"' . get_lang('ExportExcel').'",
                        onClickButton : function () {
                            jQuery("#'.$tableId.'").jqGrid("excelExport",{"url":"'.$url.'&export_format=xls"});
                        }
@@ -806,7 +806,7 @@ 
                 // adding the fields that are checked to the session
                 $message = '';
                 foreach ($values as $field_ids => $value) {
-                    if ($value == 1 && strstr($field_ids,'extra_export_field')) {
+                    if ($value == 1 && strstr($field_ids, 'extra_export_field')) {
                         $_SESSION['additional_export_fields'][] = str_replace('extra_export_field', '', $field_ids);
                     }
                 }
@@ -821,7 +821,7 @@ 
                 // Displaying a feedback message
                 if (!empty($_SESSION['additional_export_fields'])) {
                     Display::display_confirmation_message(get_lang('FollowingFieldsWillAlsoBeExported').': <br /><ul>'.$message.'</ul>', false);
-                } else  {
+                } else {
                     Display::display_confirmation_message(get_lang('NoAdditionalFieldsWillBeExported'), false);
                 }
             } else {
@@ -849,7 +849,7 @@ 
     {
         $t_head = '    <table style="width: 100%;border:0;padding:0;border-collapse:collapse;table-layout: fixed">';
         //$t_head .= '  <caption>'.get_lang('CourseInformation').'</caption>';
-        $t_head .=      '<tr>';
+        $t_head .= '<tr>';
         $t_head .= '        <th style="padding:0;border-bottom:0"><span>'.cut(get_lang('AvgTimeSpentInTheCourse'), 6, true).'</span></th>';
         $t_head .= '        <th style="padding:0;border-bottom:0"><span>'.cut(get_lang('AvgStudentsProgress'), 6, true).'</span></th>';
         $t_head .= '        <th style="padding:0;border-bottom:0"><span>'.cut(get_lang('AvgCourseScore'), 6, true).'</span></th>';
@@ -866,13 +866,13 @@ 
 
         $addparams = array('view' => 'admin', 'display' => 'courseoverview');
 
-        $table = new SortableTable('tracking_session_overview', array('MySpace', 'get_total_number_courses'), array('MySpace','get_course_data_tracking_overview'), 1);
+        $table = new SortableTable('tracking_session_overview', array('MySpace', 'get_total_number_courses'), array('MySpace', 'get_course_data_tracking_overview'), 1);
         $table->additional_parameters = $addparams;
 
         $table->set_header(0, '', false, null, array('style' => 'display: none'));
         $table->set_header(1, get_lang('Course'), true, array('style' => 'font-size:8pt'), array('style' => 'font-size:8pt'));
         $table->set_header(2, $t_head, false, array('style' => 'width:90%;border:0;padding:0;font-size:7.5pt;'), array('style' => 'width:90%;padding:0;font-size:7.5pt;'));
-        $table->set_column_filter(2, array('MySpace','course_tracking_filter'));
+        $table->set_column_filter(2, array('MySpace', 'course_tracking_filter'));
         $table->display();
     }
 
@@ -908,7 +908,7 @@ 
         $sql .= " ORDER BY col$column $direction ";
         $sql .= " LIMIT $from,$number_of_items";
         $result = Database::query($sql);
-        $return = array ();
+        $return = array();
         while ($course = Database::fetch_row($result)) {
             $return[] = $course;
         }
@@ -961,18 +961,18 @@ 
             $progress += $progress_tmp[0];
             $nb_progress_lp += $progress_tmp[1];
             $score_tmp = Tracking :: get_avg_student_score($row->user_id, $course_code, array(), null, true);
-            if(is_array($score_tmp)) {
+            if (is_array($score_tmp)) {
                 $score += $score_tmp[0];
                 $nb_score_lp += $score_tmp[1];
             }
             $nb_messages += Tracking::count_student_messages($row->user_id, $course_code);
             $nb_assignments += Tracking::count_student_assignments($row->user_id, $course_code);
             $last_login_date_tmp = Tracking :: get_last_connection_date_on_the_course($row->user_id, $courseInfo, null, false);
-            if($last_login_date_tmp != false && $last_login_date == false) { // TODO: To be cleaned
+            if ($last_login_date_tmp != false && $last_login_date == false) { // TODO: To be cleaned
                 $last_login_date = $last_login_date_tmp;
-            } else if($last_login_date_tmp != false && $last_login_date != false) { // TODO: Repeated previous condition. To be cleaned.
+            } else if ($last_login_date_tmp != false && $last_login_date != false) { // TODO: Repeated previous condition. To be cleaned.
                 // Find the max and assign it to first_login_date
-                if(strtotime($last_login_date_tmp) > strtotime($last_login_date)) {
+                if (strtotime($last_login_date_tmp) > strtotime($last_login_date)) {
                     $last_login_date = $last_login_date_tmp;
                 }
             }
@@ -1110,7 +1110,7 @@ 
                 $progress += $progress_tmp[0];
                 $nb_progress_lp += $progress_tmp[1];
                 $score_tmp = Tracking :: get_avg_student_score($row->user_id, $course_code, array(), null, true);
-                if(is_array($score_tmp)) {
+                if (is_array($score_tmp)) {
                     $score += $score_tmp[0];
                     $nb_score_lp += $score_tmp[1];
                 }
@@ -1118,11 +1118,11 @@ 
                 $nb_assignments += Tracking::count_student_assignments($row->user_id, $course_code);
 
                 $last_login_date_tmp = Tracking::get_last_connection_date_on_the_course($row->user_id, $courseInfo, null, false);
-                if($last_login_date_tmp != false && $last_login_date == false) { // TODO: To be cleaned.
+                if ($last_login_date_tmp != false && $last_login_date == false) { // TODO: To be cleaned.
                     $last_login_date = $last_login_date_tmp;
-                } else if($last_login_date_tmp != false && $last_login_date == false) { // TODO: Repeated previous condition. To be cleaned.
+                } else if ($last_login_date_tmp != false && $last_login_date == false) { // TODO: Repeated previous condition. To be cleaned.
                     // Find the max and assign it to first_login_date
-                    if(strtotime($last_login_date_tmp) > strtotime($last_login_date)) {
+                    if (strtotime($last_login_date_tmp) > strtotime($last_login_date)) {
                         $last_login_date = $last_login_date_tmp;
                     }
                 }
@@ -1132,22 +1132,22 @@ 
                 $total_score_possible += $exercise_results_tmp['score_possible'];
                 $total_questions_answered += $exercise_results_tmp['questions_answered'];
             }
-            if($nb_progress_lp > 0) {
+            if ($nb_progress_lp > 0) {
                 $avg_progress = round($progress / $nb_progress_lp, 2);
             } else {
                 $avg_progress = 0;
             }
-            if($nb_score_lp > 0) {
+            if ($nb_score_lp > 0) {
                 $avg_score = round($score / $nb_score_lp, 2);
             } else {
                 $avg_score = '-';
             }
-            if($last_login_date) {
+            if ($last_login_date) {
                 $last_login_date = api_convert_and_format_date($last_login_date, DATE_FORMAT_SHORT, date_default_timezone_get());
             } else {
                 $last_login_date = '-';
             }
-            if($total_score_possible > 0) {
+            if ($total_score_possible > 0) {
                 $total_score_percentage = round($total_score_obtained / $total_score_possible * 100, 2);
             } else {
                 $total_score_percentage = 0;
@@ -1183,7 +1183,7 @@ 
     {
         $t_head = '    <table style="width: 100%;border:0;padding:0;border-collapse:collapse;table-layout: fixed">';
         //$t_head .= '  <caption>'.get_lang('CourseInformation').'</caption>';
-        $t_head .=      '<tr>';
+        $t_head .= '<tr>';
         $t_head .= '        <th width="155px" style="border-left:0;border-bottom:0"><span>'.get_lang('Course').'</span></th>';
         $t_head .= '        <th style="padding:0;border-bottom:0"><span>'.cut(get_lang('AvgTimeSpentInTheCourse'), 6, true).'</span></th>';
         $t_head .= '        <th style="padding:0;border-bottom:0"><span>'.cut(get_lang('AvgStudentsProgress'), 6, true).'</span></th>';
@@ -1201,7 +1201,7 @@ 
 
         $addparams = array('view' => 'admin', 'display' => 'sessionoverview');
 
-        $table = new SortableTable('tracking_session_overview', array('MySpace','get_total_number_sessions'), array('MySpace','get_session_data_tracking_overview'), 1);
+        $table = new SortableTable('tracking_session_overview', array('MySpace', 'get_total_number_sessions'), array('MySpace', 'get_session_data_tracking_overview'), 1);
         $table->additional_parameters = $addparams;
 
         $table->set_header(0, '', false, null, array('style' => 'display: none'));
@@ -1240,7 +1240,7 @@ 
         $sql .= " ORDER BY col$column $direction ";
         $sql .= " LIMIT $from,$number_of_items";
         $result = Database::query($sql);
-        $return = array ();
+        $return = array();
         while ($session = Database::fetch_row($result)) {
             $return[] = $session;
         }
@@ -1329,10 +1329,10 @@ 
                 if ($last_login_date_tmp != false && $last_login_date == false) {
                     // TODO: To be cleaned.
                     $last_login_date = $last_login_date_tmp;
-                } else if($last_login_date_tmp != false && $last_login_date != false) {
+                } else if ($last_login_date_tmp != false && $last_login_date != false) {
                     // TODO: Repeated previous condition! To be cleaned.
                     // Find the max and assign it to first_login_date
-                    if(strtotime($last_login_date_tmp) > strtotime($last_login_date)) {
+                    if (strtotime($last_login_date_tmp) > strtotime($last_login_date)) {
                         $last_login_date = $last_login_date_tmp;
                     }
                 }
@@ -1342,27 +1342,27 @@ 
                 $total_score_possible += $exercise_results_tmp['score_possible'];
                 $total_questions_answered += $exercise_results_tmp['questions_answered'];
             }
-            if($nb_progress_lp > 0) {
+            if ($nb_progress_lp > 0) {
                 $avg_progress = round($progress / $nb_progress_lp, 2);
             } else {
                 $avg_progress = 0;
             }
-            if($nb_score_lp > 0) {
+            if ($nb_score_lp > 0) {
                 $avg_score = round($score / $nb_score_lp, 2);
             } else {
                 $avg_score = '-';
             }
-            if($last_login_date) {
+            if ($last_login_date) {
                 $last_login_date = api_convert_and_format_date($last_login_date, DATE_FORMAT_SHORT, date_default_timezone_get());
             } else {
                 $last_login_date = '-';
             }
-            if($total_score_possible > 0) {
+            if ($total_score_possible > 0) {
                 $total_score_percentage = round($total_score_obtained / $total_score_possible * 100, 2);
             } else {
                 $total_score_percentage = 0;
             }
-            if($total_score_percentage > 0) {
+            if ($total_score_percentage > 0) {
                 $total_score = $total_score_obtained.'/'.$total_score_possible.' ('.$total_score_percentage.' %)';
             } else {
                 $total_score = '-';
@@ -1473,7 +1473,7 @@ 
                 $total_score_obtained = 0;
                 $total_score_possible = 0;
                 $total_questions_answered = 0;
-                while($row_user = Database::fetch_object($result_users)) {
+                while ($row_user = Database::fetch_object($result_users)) {
                     // get time spent in the course and session
                     $time_spent += Tracking::get_time_spent_on_the_course($row_user->user_id, $courseId, $session_id);
                     $progress_tmp = Tracking::get_avg_student_progress($row_user->user_id, $row->code, array(), $session_id, true);
@@ -1502,11 +1502,11 @@ 
                         $session_id,
                         false
                     );
-                    if($last_login_date_tmp != false && $last_login_date == false) { // TODO: To be cleaned.
+                    if ($last_login_date_tmp != false && $last_login_date == false) { // TODO: To be cleaned.
                         $last_login_date = $last_login_date_tmp;
-                    } else if($last_login_date_tmp != false && $last_login_date == false) { // TODO: Repeated previous condition. To be cleaned.
+                    } else if ($last_login_date_tmp != false && $last_login_date == false) { // TODO: Repeated previous condition. To be cleaned.
                         // Find the max and assign it to first_login_date
-                        if(strtotime($last_login_date_tmp) > strtotime($last_login_date)) {
+                        if (strtotime($last_login_date_tmp) > strtotime($last_login_date)) {
                             $last_login_date = $last_login_date_tmp;
                         }
                     }
@@ -1516,27 +1516,27 @@ 
                     $total_score_possible += $exercise_results_tmp['score_possible'];
                     $total_questions_answered += $exercise_results_tmp['questions_answered'];
                 }
-                if($nb_progress_lp > 0) {
+                if ($nb_progress_lp > 0) {
                     $avg_progress = round($progress / $nb_progress_lp, 2);
                 } else {
                     $avg_progress = 0;
                 }
-                if($nb_score_lp > 0) {
+                if ($nb_score_lp > 0) {
                     $avg_score = round($score / $nb_score_lp, 2);
                 } else {
                     $avg_score = '-';
                 }
-                if($last_login_date) {
+                if ($last_login_date) {
                     $last_login_date = api_convert_and_format_date($last_login_date, DATE_FORMAT_SHORT, date_default_timezone_get());
                 } else {
                     $last_login_date = '-';
                 }
-                if($total_score_possible > 0) {
+                if ($total_score_possible > 0) {
                     $total_score_percentage = round($total_score_obtained / $total_score_possible * 100, 2);
                 } else {
                     $total_score_percentage = 0;
                 }
-                if($total_score_percentage > 0) {
+                if ($total_score_percentage > 0) {
                     $total_score = $total_score_obtained.'/'.$total_score_possible.' ('.$total_score_percentage.' %)';
                 } else {
                     $total_score = '-';
@@ -1596,7 +1596,7 @@ 
         while ($row = Database::fetch_array($result)) {
             $score_obtained += $row['exe_result'];
             $score_possible += $row['exe_weighting'];
-            $questions_answered ++;
+            $questions_answered++;
         }
 
         if ($score_possible != 0) {
@@ -1716,9 +1716,9 @@ 
                     }
                 }
                 // time spent in the course
-                $csv_row[] = api_time_to_hms(Tracking::get_time_spent_on_the_course ($user[4], $courseId));
+                $csv_row[] = api_time_to_hms(Tracking::get_time_spent_on_the_course($user[4], $courseId));
                 // student progress in course
-                $csv_row[] = round(Tracking::get_avg_student_progress ($user[4], $row[0]), 2);
+                $csv_row[] = round(Tracking::get_avg_student_progress($user[4], $row[0]), 2);
                 // student score
                 $csv_row[] = round(Tracking::get_avg_student_score($user[4], $row[0]), 2);
                 // student tes score
@@ -1726,7 +1726,7 @@ 
                 // student messages
                 $csv_row[] = Tracking::count_student_messages($user[4], $row[0]);
                 // student assignments
-                $csv_row[] = Tracking::count_student_assignments ($user[4], $row[0]);
+                $csv_row[] = Tracking::count_student_assignments($user[4], $row[0]);
                 // student exercises results
                 $exercises_results = MySpace::exercises_results($user[4], $row[0]);
                 $csv_row[] = $exercises_results['score_obtained'];
@@ -1734,7 +1734,7 @@ 
                 $csv_row[] = $exercises_results['questions_answered'];
                 $csv_row[] = $exercises_results['percentage'];
                 // first connection
-                $csv_row[] = Tracking::get_first_connection_date_on_the_course ($user[4], $courseId);
+                $csv_row[] = Tracking::get_first_connection_date_on_the_course($user[4], $courseId);
                 // last connection
                 $csv_row[] = strip_tags(Tracking::get_last_connection_date_on_the_course($user[4], $courseInfo));
 
@@ -1768,9 +1768,9 @@ 
         // get all courses with limit
         $sql = "SELECT course.code as col1, course.title as col2
                 FROM $tbl_course course
-                WHERE course.code IN (".implode(',',$courses_code).")";
+                WHERE course.code IN (".implode(',', $courses_code).")";
 
-        if (!in_array($direction, array('ASC','DESC'))) $direction = 'ASC';
+        if (!in_array($direction, array('ASC', 'DESC'))) $direction = 'ASC';
 
         $column = intval($column);
         $from = intval($from);
@@ -1839,7 +1839,7 @@ 
             $table_row[] = $avg_assignments_in_course;
 
             //set the "from" value to know if I access the Reporting by the chamilo tab or the course link
-            $table_row[] = '<center><a href="../../tracking/courseLog.php?cidReq=' .$course_code.'&from=myspace&id_session='.$session_id.'">
+            $table_row[] = '<center><a href="../../tracking/courseLog.php?cidReq='.$course_code.'&from=myspace&id_session='.$session_id.'">
                              '.Display::return_icon('2rightarrow.png').'
                              </a>
                             </center>';
@@ -1848,7 +1848,7 @@ 
                 $nb_students_in_course,
                 $avg_time_spent_in_course,
                 is_null($avg_progress_in_course) ? null : $avg_progress_in_course.'%',
-                is_null($avg_score_in_course) ? null : is_numeric($avg_score_in_course) ? $avg_score_in_course.'%' : $avg_score_in_course ,
+                is_null($avg_score_in_course) ? null : is_numeric($avg_score_in_course) ? $avg_score_in_course.'%' : $avg_score_in_course,
                 is_null($avg_score_in_exercise) ? null : $avg_score_in_exercise.'%',
                 $avg_messages_in_course,
                 $avg_assignments_in_course,
@@ -1916,7 +1916,7 @@ 
         $sql .= " ORDER BY col$column $direction ";
         $sql .= " LIMIT $from,$number_of_items";
         $result = Database::query($sql);
-        $return = array ();
+        $return = array();
         while ($user = Database::fetch_row($result)) {
             $return[] = $user;
         }
@@ -1971,7 +1971,7 @@ 
                     $i++;
                 }
             }
-            $username_array = array('username' => $desired_username , 'sufix' => $sufix);
+            $username_array = array('username' => $desired_username, 'sufix' => $sufix);
             return $username_array;
         } else {
             $username_array = array('username' => $username, 'sufix' => '');
@@ -2246,7 +2246,7 @@ 
         foreach ($users as $index => $user) {
             $userid = $user['id'];
             $sql_insert = "INSERT IGNORE INTO $tbl_session_rel_user(session_id, user_id, registered_at)
-                           VALUES ('$id_session','$userid', '" . api_get_utc_datetime() . "')";
+                           VALUES ('$id_session','$userid', '".api_get_utc_datetime()."')";
             Database::query($sql_insert);
             $user['added_at_session'] = 1;
             $new_users[] = $user;
@@ -2280,10 +2280,10 @@ 
                 );
                 $userInfo = api_get_user_info($user['id']);
 
-                if (($user['added_at_platform'] == 1  && $user['added_at_session'] == 1) || $user['added_at_session'] == 1) {
+                if (($user['added_at_platform'] == 1 && $user['added_at_session'] == 1) || $user['added_at_session'] == 1) {
                     if ($user['added_at_platform'] == 1) {
                         $addedto = get_lang('UserCreatedPlatform');
-                    } else  {
+                    } else {
                         $addedto = '          ';
                     }
 
@@ -2346,7 +2346,7 @@ 
         global $current_tag;
         switch ($data) {
             case 'Contact' :
-                $user = array ();
+                $user = array();
                 break;
             default :
                 $current_tag = $data;
@@ -2393,9 +2393,9 @@ 
         global $current_value;
         global $user;
         global $users;
-        $users = array ();
+        $users = array();
         $parser = xml_parser_create('UTF-8');
-        xml_set_element_handler($parser, array('MySpace','element_start'), array('MySpace','element_end'));
+        xml_set_element_handler($parser, array('MySpace', 'element_start'), array('MySpace', 'element_end'));
         xml_set_character_data_handler($parser, "character_data");
         xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, false);
         xml_parse($parser, api_utf8_encode_xml(file_get_contents($file)));
@@ -2441,7 +2441,7 @@ 
             get_lang('SearchCourse'),
             $courseList,
             [
-                'url' => api_get_path(WEB_AJAX_PATH) . 'course.ajax.php?' . http_build_query([
+                'url' => api_get_path(WEB_AJAX_PATH).'course.ajax.php?'.http_build_query([
                     'a' => 'search_course_by_session_all',
                     'session_id' => $sessionId
                 ])
@@ -2460,7 +2460,7 @@ 
                             course_id: $('#course_id').val() || 0
                         });
 
-                        return '" . api_get_path(WEB_AJAX_PATH) . "session.ajax.php?' + params;
+                        return '" . api_get_path(WEB_AJAX_PATH)."session.ajax.php?' + params;
                     }
                 "
             ]
@@ -2491,7 +2491,7 @@ 
                             course_id: $('#course_id').val()
                         });
 
-                        return '" . api_get_path(WEB_AJAX_PATH) . "course.ajax.php?' + params;
+                        return '" . api_get_path(WEB_AJAX_PATH)."course.ajax.php?' + params;
                     }
                 "
             ]
@@ -2579,7 +2579,7 @@ 
                     " : "
                         u.lastname AS col2,
                         u.firstname AS col3,
-                " ) . "
+                " )."
                 a.logout_course_date,
                 c.title,
                 c.code,
@@ -2590,7 +2590,7 @@ 
 
         if (isset($_GET['session_id']) && !empty($_GET['session_id'])) {
             $sessionId = intval($_GET['session_id']);
-            $sql .= " WHERE a.session_id = " . $sessionId;
+            $sql .= " WHERE a.session_id = ".$sessionId;
         }
 
         $sql .= " ORDER BY col$column $orderDirection ";
@@ -2696,13 +2696,13 @@ 
 function get_stats($user_id, $courseId, $start_date = null, $end_date = null)
 {
     // Database table definitions
-    $tbl_track_course   = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS);
+    $tbl_track_course = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS);
 
     $course_info = api_get_course_info_by_id($courseId);
     if (!empty($course_info)) {
         $strg_sd = '';
         $strg_ed = '';
-        if ($start_date != null && $end_date != null){
+        if ($start_date != null && $end_date != null) {
             $end_date = add_day_to($end_date);
             $strg_sd = "AND login_course_date BETWEEN '$start_date' AND '$end_date'";
             $strg_ed = "AND logout_course_date BETWEEN '$start_date' AND '$end_date'";
@@ -2711,10 +2711,10 @@ 
                 SEC_TO_TIME(avg(time_to_sec(timediff(logout_course_date,login_course_date)))) as avrg,
                 SEC_TO_TIME(sum(time_to_sec(timediff(logout_course_date,login_course_date)))) as total,
                 count(user_id) as times
-                FROM ' . $tbl_track_course . '
+                FROM ' . $tbl_track_course.'
                 WHERE
-                    user_id = ' . intval($user_id) . ' AND
-                    c_id = ' . intval($courseId) . ' '.$strg_sd.' '.$strg_ed.' '.'
+                    user_id = ' . intval($user_id).' AND
+                    c_id = ' . intval($courseId).' '.$strg_sd.' '.$strg_ed.' '.'
                 ORDER BY login_course_date ASC';
 
         $rs = Database::query($sql);
@@ -2732,7 +2732,7 @@ 
 }
 
 function add_day_to($end_date) {
-    $foo_date = strtotime( $end_date );
+    $foo_date = strtotime($end_date);
     $foo_date = strtotime(" +1 day", $foo_date);
     $foo_date = date("Y-m-d", $foo_date);
     return $foo_date;
@@ -2746,7 +2746,7 @@ 
  * @version OCT-22- 2010
  * @return array
  */
-function convert_to_array($sql_result){
+function convert_to_array($sql_result) {
     $result_to_print = '<table>';
     foreach ($sql_result as $key => $data) {
         $result_to_print .= '<tr><td>'.date('d-m-Y (H:i:s)', $data['login']).'</td><td>'.api_time_to_hms($data['logout'] - $data['login']).'</tr></td>'."\n";
@@ -2765,7 +2765,7 @@ 
  * @version OCT-22- 2010
  * @return string
  */
-function convert_to_string($sql_result){
+function convert_to_string($sql_result) {
     $result_to_print = '<table>';
     if (!empty($sql_result)) {
         foreach ($sql_result as $key => $data) {
@@ -2790,18 +2790,18 @@ 
  */
 function grapher($sql_result, $start_date, $end_date, $type = "")
 {
-    if (empty($start_date)) { $start_date =""; }
-    if (empty($end_date)) { $end_date =""; }
-    if ($type == ""){ $type = 'day'; }
-    $main_year  = $main_month_year = $main_day = array();
+    if (empty($start_date)) { $start_date = ""; }
+    if (empty($end_date)) { $end_date = ""; }
+    if ($type == "") { $type = 'day'; }
+    $main_year = $main_month_year = $main_day = array();
     // get last 8 days/months
     $last_days      = 5;
     $last_months    = 3;
     for ($i = $last_days; $i >= 0; $i--) {
-        $main_day[date ('d-m-Y', time () - $i * 3600 * 24)] = 0;
+        $main_day[date('d-m-Y', time() - $i * 3600 * 24)] = 0;
     }
     for ($i = $last_months; $i >= 0; $i--) {
-        $main_month_year[date ('m-Y', time () - $i * 30 * 3600 * 24)] = 0;
+        $main_month_year[date('m-Y', time() - $i * 30 * 3600 * 24)] = 0;
     }
 
     $i = 0;
@@ -2837,7 +2837,7 @@ 
         /* Create and populate the pData object */
         $myData = new pData();
         $myData->addPoints($main_date, 'Serie1');
-        if (count($main_date)!= 1) {
+        if (count($main_date) != 1) {
             $myData->addPoints($labels, 'Labels');
             $myData->setSerieDescription('Labels', 'Months');
             $myData->setAbscissa('Labels');
@@ -2845,7 +2845,7 @@ 
         $myData->setSerieWeight('Serie1', 1);
         $myData->setSerieDescription('Serie1', get_lang('MyResults'));
         $myData->setAxisName(0, get_lang('Minutes'));
-        $myData->loadPalette(api_get_path(SYS_CODE_PATH) . 'palettes/pchart/default.color', true);
+        $myData->loadPalette(api_get_path(SYS_CODE_PATH).'palettes/pchart/default.color', true);
 
         // Cache definition
         $cachePath = api_get_path(SYS_ARCHIVE_PATH);
@@ -2854,9 +2854,9 @@ 
 
         if ($myCache->isInCache($chartHash)) {
             //if we already created the img
-            $imgPath = api_get_path(SYS_ARCHIVE_PATH) . $chartHash;
+            $imgPath = api_get_path(SYS_ARCHIVE_PATH).$chartHash;
             $myCache->saveFromCache($chartHash, $imgPath);
-            $imgPath = api_get_path(WEB_ARCHIVE_PATH) . $chartHash;
+            $imgPath = api_get_path(WEB_ARCHIVE_PATH).$chartHash;
         } else {
             /* Define width, height and angle */
             $mainWidth = 760;
@@ -2885,7 +2885,7 @@ 
             /* Set the default font */
             $myPicture->setFontProperties(
                 array(
-                    "FontName" => api_get_path(SYS_FONTS_PATH) . 'opensans/OpenSans-Regular.ttf',
+                    "FontName" => api_get_path(SYS_FONTS_PATH).'opensans/OpenSans-Regular.ttf',
                     "FontSize" => 10)
             );
             /* Write the chart title */
@@ -2902,7 +2902,7 @@ 
             /* Set the default font */
             $myPicture->setFontProperties(
                 array(
-                    "FontName" => api_get_path(SYS_FONTS_PATH) . 'opensans/OpenSans-Regular.ttf',
+                    "FontName" => api_get_path(SYS_FONTS_PATH).'opensans/OpenSans-Regular.ttf',
                     "FontSize" => 8
                 )
             );
@@ -2944,7 +2944,7 @@ 
             /* Draw the line chart */
             $myPicture->setFontProperties(
                 array(
-                    "FontName" => api_get_path(SYS_FONTS_PATH) . 'opensans/OpenSans-Regular.ttf',
+                    "FontName" => api_get_path(SYS_FONTS_PATH).'opensans/OpenSans-Regular.ttf',
                     "FontSize" => 10
                 )
             );
@@ -2963,15 +2963,15 @@ 
 
             /* Write and save into cache */
             $myCache->writeToCache($chartHash, $myPicture);
-            $imgPath = api_get_path(SYS_ARCHIVE_PATH) . $chartHash;
+            $imgPath = api_get_path(SYS_ARCHIVE_PATH).$chartHash;
             $myCache->saveFromCache($chartHash, $imgPath);
-            $imgPath = api_get_path(WEB_ARCHIVE_PATH) . $chartHash;
+            $imgPath = api_get_path(WEB_ARCHIVE_PATH).$chartHash;
         }
-        $html = '<img src="' . $imgPath . '">';
+        $html = '<img src="'.$imgPath.'">';
 
         return $html;
     } else {
-        $foo_img = api_convert_encoding('<div id="messages" class="warning-message">'.get_lang('GraphicNotAvailable').'</div>','UTF-8');
+        $foo_img = api_convert_encoding('<div id="messages" class="warning-message">'.get_lang('GraphicNotAvailable').'</div>', 'UTF-8');
 
         return $foo_img;
     }

main/inc/lib/security.lib.php

Spacing +3 added lines, -3 removed lines

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

Indentation +11 added lines, -11 removed lines

@@ -304,9 +304,9 @@ 
      */
     public static function remove_XSS($var, $user_status = null, $filter_terms = false)
     {
-    	if ($filter_terms) {
-    		$var = self::filter_terms($var);
-    	}
+        if ($filter_terms) {
+            $var = self::filter_terms($var);
+        }
 
         if (empty($user_status)) {
             if (api_is_anonymous()) {
@@ -401,7 +401,7 @@ 
      */
     public static function filter_terms($text)
     {
-    	static $bad_terms = array();
+        static $bad_terms = array();
 
         if (empty($bad_terms)) {
             $list = api_get_setting('filter_terms');
@@ -422,14 +422,14 @@ 
             }
         }
 
-    	$replace = '***';
-    	if (!empty($bad_terms)) {
-    		// Fast way
-    		$new_text = str_ireplace($bad_terms, $replace, $text, $count);
-    		$text = $new_text;
-    	}
+        $replace = '***';
+        if (!empty($bad_terms)) {
+            // Fast way
+            $new_text = str_ireplace($bad_terms, $replace, $text, $count);
+            $text = $new_text;
+        }
         
-		return $text;
+        return $text;
     }
 
 

main/inc/lib/access_url_edit_users_to_url_functions.lib.php

Spacing +4 added lines, -4 removed lines

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

Indentation +4 added lines, -4 removed lines

@@ -40,11 +40,11 @@
             // search users where username or firstname or lastname begins likes $needle
             $order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname, username' : ' ORDER BY lastname, firstname, username';
             $sql = 'SELECT u.user_id, username, lastname, firstname FROM '.$tbl_user.' u '.
-                   ' WHERE (username LIKE "'.$needle.'%" '.
-                   ' OR firstname LIKE "'.$needle.'%" '.
-                   ' OR lastname LIKE "'.$needle.'%") '.
+                    ' WHERE (username LIKE "'.$needle.'%" '.
+                    ' OR firstname LIKE "'.$needle.'%" '.
+                    ' OR lastname LIKE "'.$needle.'%") '.
                     $order_clause .
-                   ' LIMIT 11';
+                    ' LIMIT 11';
 
             $rs = Database::query($sql);
             $i=0;

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

Braces +6 added lines, -4 removed lines

@@ -173,8 +173,9 @@ 
 		}

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

 			$this->loadWSDL();

-			if ($this->getError())

-				return false;

+			if ($this->getError()) {
+							return false;
+			}
 		}

 		// serialize parameters

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

@@ -388,8 +389,9 @@ 
 	function getOperationData($operation){

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

 			$this->loadWSDL();

-			if ($this->getError())

-				return false;

+			if ($this->getError()) {
+							return false;
+			}
 		}

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

 			return $this->operations[$operation];

Indentation +903 added lines, -903 removed lines

@@ -22,967 +22,967 @@
 */

 class nusoap_client extends nusoap_base

 {

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

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

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

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

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

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

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

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

-	var $endpoint;

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

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

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

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

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

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

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

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

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

+    var $endpoint;

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

     var $proxyhost = '';

     var $proxyport = '';

-	var $proxyusername = '';

-	var $proxypassword = '';

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

+    var $proxyusername = '';

+    var $proxypassword = '';

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

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

-	var $http_encoding = false;

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

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

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

-	var $persistentConnection = false;

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

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

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

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

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

+    var $http_encoding = false;

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

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

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

+    var $persistentConnection = false;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 

-	/*

+    /*

 	 * fault related variables

 	 */

-	/**

-	 * @var      fault

-	 * @access   public

-	 */

-	var $fault;

-	/**

-	 * @var      faultcode

-	 * @access   public

-	 */

-	var $faultcode;

-	/**

-	 * @var      faultstring

-	 * @access   public

-	 */

-	var $faultstring;

-	/**

-	 * @var      faultdetail

-	 * @access   public

-	 */

-	var $faultdetail;

-

-	/**

-	* constructor

-	*

-	* @param    mixed $endpoint SOAP server or WSDL URL (string), or wsdl instance (object)

-	* @param    mixed $wsdl optional, set to 'wsdl' or true if using WSDL

-	* @param    string $proxyhost optional

-	* @param    string $proxyport optional

-	* @param	string $proxyusername optional

-	* @param	string $proxypassword optional

-	* @param	integer $timeout set the connection timeout

-	* @param	integer $response_timeout set the response timeout

-	* @param	string $portName optional portName in WSDL document

-	* @access   public

-	*/

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

-		parent::__construct();

-		$this->endpoint = $endpoint;

-		$this->proxyhost = $proxyhost;

-		$this->proxyport = $proxyport;

-		$this->proxyusername = $proxyusername;

-		$this->proxypassword = $proxypassword;

-		$this->timeout = $timeout;

-		$this->response_timeout = $response_timeout;

-		$this->portName = $portName;

-

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

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

-

-		// make values

-		if($wsdl){

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

-				$this->wsdl = $endpoint;

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

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

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

-				$this->checkWSDL();

-			} else {

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

-				$this->wsdl = null;

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

-			}

-			$this->endpointType = 'wsdl';

-		} else {

-			$this->debug("instantiate SOAP with endpoint at $endpoint");

-			$this->endpointType = 'soap';

-		}

-	}

+    /**

+     * @var      fault

+     * @access   public

+     */

+    var $fault;

+    /**

+     * @var      faultcode

+     * @access   public

+     */

+    var $faultcode;

+    /**

+     * @var      faultstring

+     * @access   public

+     */

+    var $faultstring;

+    /**

+     * @var      faultdetail

+     * @access   public

+     */

+    var $faultdetail;

 

-	/**

-	* calls method, returns PHP native type

-	*

-	* @param    string $operation SOAP server URL or path

-	* @param    mixed $params An array, associative or simple, of the parameters

-	*			              for the method call, or a string that is the XML

-	*			              for the call.  For rpc style, this call will

-	*			              wrap the XML in a tag named after the method, as

-	*			              well as the SOAP Envelope and Body.  For document

-	*			              style, this will only wrap with the Envelope and Body.

-	*			              IMPORTANT: when using an array with document style,

-	*			              in which case there

-	*                         is really one parameter, the root of the fragment

-	*                         used in the call, which encloses what programmers

-	*                         normally think of parameters.  A parameter array

-	*                         *must* include the wrapper.

-	* @param	string $namespace optional method namespace (WSDL can override)

-	* @param	string $soapAction optional SOAPAction value (WSDL can override)

-	* @param	mixed $headers optional string of XML with SOAP header content, or array of soapval objects for SOAP headers, or associative array

-	* @param	boolean $rpcParams optional (no longer used)

-	* @param	string	$style optional (rpc|document) the style to use when serializing parameters (WSDL can override)

-	* @param	string	$use optional (encoded|literal) the use when serializing parameters (WSDL can override)

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

-	* @access   public

-	*/

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

-		$this->operation = $operation;

-		$this->fault = false;

-		$this->setError('');

-		$this->request = '';

-		$this->response = '';

-		$this->responseData = '';

-		$this->faultstring = '';

-		$this->faultcode = '';

-		$this->opData = array();

-

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

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

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

-		if ($headers) {

-			$this->requestHeaders = $headers;

-		}

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

-			$this->loadWSDL();

-			if ($this->getError())

-				return false;

-		}

-		// serialize parameters

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

-			// use WSDL for operation

-			$this->opData = $opData;

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

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

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

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

-			}

-			if (! $this->forceEndpoint) {

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

-			} else {

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

-			}

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

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

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

-			// add ns to ns array

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

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

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

-			}

+    /**

+     * constructor

+     *

+     * @param    mixed $endpoint SOAP server or WSDL URL (string), or wsdl instance (object)

+     * @param    mixed $wsdl optional, set to 'wsdl' or true if using WSDL

+     * @param    string $proxyhost optional

+     * @param    string $proxyport optional

+     * @param	string $proxyusername optional

+     * @param	string $proxypassword optional

+     * @param	integer $timeout set the connection timeout

+     * @param	integer $response_timeout set the response timeout

+     * @param	string $portName optional portName in WSDL document

+     * @access   public

+     */

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

+        parent::__construct();

+        $this->endpoint = $endpoint;

+        $this->proxyhost = $proxyhost;

+        $this->proxyport = $proxyport;

+        $this->proxyusername = $proxyusername;

+        $this->proxypassword = $proxypassword;

+        $this->timeout = $timeout;

+        $this->response_timeout = $response_timeout;

+        $this->portName = $portName;

+

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

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

+

+        // make values

+        if($wsdl){

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

+                $this->wsdl = $endpoint;

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

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

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

+                $this->checkWSDL();

+            } else {

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

+                $this->wsdl = null;

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

+            }

+            $this->endpointType = 'wsdl';

+        } else {

+            $this->debug("instantiate SOAP with endpoint at $endpoint");

+            $this->endpointType = 'soap';

+        }

+    }

+

+    /**

+     * calls method, returns PHP native type

+     *

+     * @param    string $operation SOAP server URL or path

+     * @param    mixed $params An array, associative or simple, of the parameters

+     *			              for the method call, or a string that is the XML

+     *			              for the call.  For rpc style, this call will

+     *			              wrap the XML in a tag named after the method, as

+     *			              well as the SOAP Envelope and Body.  For document

+     *			              style, this will only wrap with the Envelope and Body.

+     *			              IMPORTANT: when using an array with document style,

+     *			              in which case there

+     *                         is really one parameter, the root of the fragment

+     *                         used in the call, which encloses what programmers

+     *                         normally think of parameters.  A parameter array

+     *                         *must* include the wrapper.

+     * @param	string $namespace optional method namespace (WSDL can override)

+     * @param	string $soapAction optional SOAPAction value (WSDL can override)

+     * @param	mixed $headers optional string of XML with SOAP header content, or array of soapval objects for SOAP headers, or associative array

+     * @param	boolean $rpcParams optional (no longer used)

+     * @param	string	$style optional (rpc|document) the style to use when serializing parameters (WSDL can override)

+     * @param	string	$use optional (encoded|literal) the use when serializing parameters (WSDL can override)

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

+     * @access   public

+     */

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

+        $this->operation = $operation;

+        $this->fault = false;

+        $this->setError('');

+        $this->request = '';

+        $this->response = '';

+        $this->responseData = '';

+        $this->faultstring = '';

+        $this->faultcode = '';

+        $this->opData = array();

+

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

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

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

+        if ($headers) {

+            $this->requestHeaders = $headers;

+        }

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

+            $this->loadWSDL();

+            if ($this->getError())

+                return false;

+        }

+        // serialize parameters

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

+            // use WSDL for operation

+            $this->opData = $opData;

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

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

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

+                $soapAction = $opData['soapAction'];

+            }

+            if (! $this->forceEndpoint) {

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

+            } else {

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

+            }

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

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

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

+            // add ns to ns array

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

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

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

+            }

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

-			// serialize payload

-			if (is_string($params)) {

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

-				$payload = $params;

-			} elseif (is_array($params)) {

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

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

-			} else {

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

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

-				return false;

-			}

+            // serialize payload

+            if (is_string($params)) {

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

+                $payload = $params;

+            } elseif (is_array($params)) {

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

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

+            } else {

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

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

+                return false;

+            }

             $usedNamespaces = $this->wsdl->usedNamespaces;

-			if (isset($opData['input']['encodingStyle'])) {

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

-			} else {

-				$encodingStyle = '';

-			}

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

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

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

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

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

-				return false;

-			}

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

-			// operation not in WSDL

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

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

-			$this->setError('operation '.$operation.' not present in WSDL.');

-			$this->debug("operation '$operation' not present in WSDL.");

-			return false;

-		} else {

-			// no WSDL

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

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

-			// serialize

-			$payload = '';

-			if (is_string($params)) {

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

-				$payload = $params;

-			} elseif (is_array($params)) {

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

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

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

-				}

-			} else {

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

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

-				return false;

-			}

-			$usedNamespaces = array();

-			if ($use == 'encoded') {

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

-			} else {

-				$encodingStyle = '';

-			}

-		}

-		// wrap RPC calls with method element

-		if ($style == 'rpc') {

-			if ($use == 'literal') {

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

-				if ($namespace) {

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

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

-								$payload .

-								"</$nsPrefix:$operation>";

-				} else {

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

-				}

-			} else {

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

-				if ($namespace) {

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

-								$payload .

-								"</$nsPrefix:$operation>";

-				} else {

-					$payload = "<$operation>" .

-								$payload .

-								"</$operation>";

-				}

-			}

-		}

-		// serialize envelope

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

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

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

-		// send

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

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

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

-			return false;

-		} else {

-			$this->return = $return;

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

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

-

-			// fault?

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

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

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

-				$this->fault = true;

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

-					$this->$k = $v;

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

-				}

-				return $return;

-			} elseif ($style == 'document') {

-				// NOTE: if the response is defined to have multiple parts (i.e. unwrapped),

-				// we are only going to return the first part here...sorry about that

-				return $return;

-			} else {

-				// array of return values

-				if(is_array($return)){

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

-					// in the array

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

-						return $return;

-					}

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

-					$return = array_shift($return);

-					$this->debug('return shifted value: ');

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

-           			return $return;

-				// nothing returned (ie, echoVoid)

-				} else {

-					return "";

-				}

-			}

-		}

-	}

+            if (isset($opData['input']['encodingStyle'])) {

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

+            } else {

+                $encodingStyle = '';

+            }

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

+            $this->wsdl->clearDebug();

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

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

+                $this->setError('wsdl error: '.$errstr);

+                return false;

+            }

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

+            // operation not in WSDL

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

+            $this->wsdl->clearDebug();

+            $this->setError('operation '.$operation.' not present in WSDL.');

+            $this->debug("operation '$operation' not present in WSDL.");

+            return false;

+        } else {

+            // no WSDL

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

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

+            // serialize

+            $payload = '';

+            if (is_string($params)) {

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

+                $payload = $params;

+            } elseif (is_array($params)) {

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

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

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

+                }

+            } else {

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

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

+                return false;

+            }

+            $usedNamespaces = array();

+            if ($use == 'encoded') {

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

+            } else {

+                $encodingStyle = '';

+            }

+        }

+        // wrap RPC calls with method element

+        if ($style == 'rpc') {

+            if ($use == 'literal') {

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

+                if ($namespace) {

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

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

+                                $payload .

+                                "</$nsPrefix:$operation>";

+                } else {

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

+                }

+            } else {

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

+                if ($namespace) {

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

+                                $payload .

+                                "</$nsPrefix:$operation>";

+                } else {

+                    $payload = "<$operation>" .

+                                $payload .

+                                "</$operation>";

+                }

+            }

+        }

+        // serialize envelope

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

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

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

+        // send

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

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

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

+            return false;

+        } else {

+            $this->return = $return;

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

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

+

+            // fault?

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

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

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

+                $this->fault = true;

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

+                    $this->$k = $v;

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

+                }

+                return $return;

+            } elseif ($style == 'document') {

+                // NOTE: if the response is defined to have multiple parts (i.e. unwrapped),

+                // we are only going to return the first part here...sorry about that

+                return $return;

+            } else {

+                // array of return values

+                if(is_array($return)){

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

+                    // in the array

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

+                        return $return;

+                    }

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

+                    $return = array_shift($return);

+                    $this->debug('return shifted value: ');

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

+                        return $return;

+                // nothing returned (ie, echoVoid)

+                } else {

+                    return "";

+                }

+            }

+        }

+    }

 

-	/**

-	* check WSDL passed as an instance or pulled from an endpoint

-	*

-	* @access   private

-	*/

-	function checkWSDL() {

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

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

-		$this->debug('checkWSDL');

-		// catch errors

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

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

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

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

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

-		} elseif ($this->operations = $this->wsdl->getOperations($this->portName, 'soap')) {

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

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

-			$this->bindingType = 'soap';

-			$this->debug('got '.count($this->operations).' operations from wsdl '.$this->wsdlFile.' for binding type '.$this->bindingType);

-		} elseif ($this->operations = $this->wsdl->getOperations($this->portName, 'soap12')) {

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

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

-			$this->bindingType = 'soap12';

-			$this->debug('got '.count($this->operations).' operations from wsdl '.$this->wsdlFile.' for binding type '.$this->bindingType);

-			$this->debug('**************** WARNING: SOAP 1.2 BINDING *****************');

-		} else {

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

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

-			$this->debug('getOperations returned false');

-			$this->setError('no operations defined in the WSDL document!');

-		}

-	}

+    /**

+     * check WSDL passed as an instance or pulled from an endpoint

+     *

+     * @access   private

+     */

+    function checkWSDL() {

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

+        $this->wsdl->clearDebug();

+        $this->debug('checkWSDL');

+        // catch errors

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

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

+            $this->wsdl->clearDebug();

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

+            $this->setError('wsdl error: '.$errstr);

+        } elseif ($this->operations = $this->wsdl->getOperations($this->portName, 'soap')) {

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

+            $this->wsdl->clearDebug();

+            $this->bindingType = 'soap';

+            $this->debug('got '.count($this->operations).' operations from wsdl '.$this->wsdlFile.' for binding type '.$this->bindingType);

+        } elseif ($this->operations = $this->wsdl->getOperations($this->portName, 'soap12')) {

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

+            $this->wsdl->clearDebug();

+            $this->bindingType = 'soap12';

+            $this->debug('got '.count($this->operations).' operations from wsdl '.$this->wsdlFile.' for binding type '.$this->bindingType);

+            $this->debug('**************** WARNING: SOAP 1.2 BINDING *****************');

+        } else {

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

+            $this->wsdl->clearDebug();

+            $this->debug('getOperations returned false');

+            $this->setError('no operations defined in the WSDL document!');

+        }

+    }

 

-	/**

-	 * instantiate wsdl object and parse wsdl file

-	 *

-	 * @access	public

-	 */

-	function loadWSDL() {

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

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

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

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

-		$this->checkWSDL();

-	}

+    /**

+     * instantiate wsdl object and parse wsdl file

+     *

+     * @access	public

+     */

+    function loadWSDL() {

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

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

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

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

+        $this->checkWSDL();

+    }

 

-	/**

-	* get available data pertaining to an operation

-	*

-	* @param    string $operation operation name

-	* @return	array array of data pertaining to the operation

-	* @access   public

-	*/

-	function getOperationData($operation){

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

-			$this->loadWSDL();

-			if ($this->getError())

-				return false;

-		}

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

-			return $this->operations[$operation];

-		}

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

-	}

+    /**

+     * get available data pertaining to an operation

+     *

+     * @param    string $operation operation name

+     * @return	array array of data pertaining to the operation

+     * @access   public

+     */

+    function getOperationData($operation){

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

+            $this->loadWSDL();

+            if ($this->getError())

+                return false;

+        }

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

+            return $this->operations[$operation];

+        }

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

+    }

 

     /**

-    * send the SOAP message

-    *

-    * Note: if the operation has multiple return values

-    * the return value of this method will be an array

-    * of those values.

-    *

-	* @param    string $msg a SOAPx4 soapmsg object

-	* @param    string $soapaction SOAPAction value

-	* @param    integer $timeout set connection timeout in seconds

-	* @param	integer $response_timeout set response timeout in seconds

-	* @return	mixed native PHP types.

-	* @access   private

-	*/

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

-		$this->checkCookies();

-		// detect transport

-		switch(true){

-			// http(s)

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

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

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

-					$http =& $this->persistentConnection;

-				} else {

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

-					if ($this->persistentConnection) {

-						$http->usePersistentConnection();

-					}

-				}

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

-				$http->setSOAPAction($soapaction);

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

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

-				}

+     * send the SOAP message

+     *

+     * Note: if the operation has multiple return values

+     * the return value of this method will be an array

+     * of those values.

+     *

+     * @param    string $msg a SOAPx4 soapmsg object

+     * @param    string $soapaction SOAPAction value

+     * @param    integer $timeout set connection timeout in seconds

+     * @param	integer $response_timeout set response timeout in seconds

+     * @return	mixed native PHP types.

+     * @access   private

+     */

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

+        $this->checkCookies();

+        // detect transport

+        switch(true){

+            // http(s)

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

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

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

+                    $http =& $this->persistentConnection;

+                } else {

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

+                    if ($this->persistentConnection) {

+                        $http->usePersistentConnection();

+                    }

+                }

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

+                $http->setSOAPAction($soapaction);

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

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

+                }

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

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

-				}

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

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

-				}

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

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

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

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

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

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

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

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

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

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

-					//} else

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

-				} else {

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

-				}

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

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

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

-				$this->UpdateCookies($http->incoming_cookies);

-

-				// save transport object if using persistent connections

-				if ($this->persistentConnection) {

-					$http->clearDebug();

-					if (!is_object($this->persistentConnection)) {

-						$this->persistentConnection = $http;

-					}

-				}

-

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

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

-					return false;

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

-					return false;

-				} else {

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

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

-				}

-			break;

-			default:

-				$this->setError('no transport found, or selected transport is not yet supported!');

-			return false;

-			break;

-		}

-	}

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

+                }

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

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

+                }

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

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

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

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

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

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

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

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

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

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

+                    //} else

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

+                } else {

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

+                }

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

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

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

+                $this->UpdateCookies($http->incoming_cookies);

+

+                // save transport object if using persistent connections

+                if ($this->persistentConnection) {

+                    $http->clearDebug();

+                    if (!is_object($this->persistentConnection)) {

+                        $this->persistentConnection = $http;

+                    }

+                }

+

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

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

+                    return false;

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

+                    return false;

+                } else {

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

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

+                }

+            break;

+            default:

+                $this->setError('no transport found, or selected transport is not yet supported!');

+            return false;

+            break;

+        }

+    }

 

-	/**

-	* processes SOAP message returned from server

-	*

-	* @param	array	$headers	The HTTP headers

-	* @param	string	$data		unprocessed response data from server

-	* @return	mixed	value of the message, decoded into a PHP type

-	* @access   private

-	*/

+    /**

+     * processes SOAP message returned from server

+     *

+     * @param	array	$headers	The HTTP headers

+     * @param	string	$data		unprocessed response data from server

+     * @return	mixed	value of the message, decoded into a PHP type

+     * @access   private

+     */

     function parseResponse($headers, $data) {

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

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

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

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

-			return false;

-    	}

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

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

-			return false;

-		}

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

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

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

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

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

-			} else {

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

-			}

-		} else {

-			// should be US-ASCII for HTTP 1.0 or ISO-8859-1 for HTTP 1.1

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

-		}

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

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

-		// add parser debug data to our debug

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

-		// if parse errors

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

-			$this->setError( $errstr);

-			// destroy the parser object

-			unset($parser);

-			return false;

-		} else {

-			// get SOAP headers

-			$this->responseHeaders = $parser->getHeaders();

-			// get SOAP headers

-			$this->responseHeader = $parser->get_soapheader();

-			// get decoded message

-			$return = $parser->get_soapbody();

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

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

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

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

+            return false;

+        }

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

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

+            return false;

+        }

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

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

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

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

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

+            } else {

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

+            }

+        } else {

+            // should be US-ASCII for HTTP 1.0 or ISO-8859-1 for HTTP 1.1

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

+        }

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

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

+        // add parser debug data to our debug

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

+        // if parse errors

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

+            $this->setError( $errstr);

+            // destroy the parser object

+            unset($parser);

+            return false;

+        } else {

+            // get SOAP headers

+            $this->responseHeaders = $parser->getHeaders();

+            // get SOAP headers

+            $this->responseHeader = $parser->get_soapheader();

+            // get decoded message

+            $return = $parser->get_soapbody();

             // add document for doclit support

             $this->document = $parser->document;

-			// destroy the parser object

-			unset($parser);

-			// return decode message

-			return $return;

-		}

-	 }

-

-	/**

-	* sets user-specified cURL options

-	*

-	* @param	mixed $option The cURL option (always integer?)

-	* @param	mixed $value The cURL option value

-	* @access   public

-	*/

-	function setCurlOption($option, $value) {

-		$this->debug("setCurlOption option=$option, value=");

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

-		$this->curl_options[$option] = $value;

-	}

+            // destroy the parser object

+            unset($parser);

+            // return decode message

+            return $return;

+        }

+        }

 

-	/**

-	* sets the SOAP endpoint, which can override WSDL

-	*

-	* @param	string $endpoint The endpoint URL to use, or empty string or false to prevent override

-	* @access   public

-	*/

-	function setEndpoint($endpoint) {

-		$this->debug("setEndpoint(\"$endpoint\")");

-		$this->forceEndpoint = $endpoint;

-	}

+    /**

+     * sets user-specified cURL options

+     *

+     * @param	mixed $option The cURL option (always integer?)

+     * @param	mixed $value The cURL option value

+     * @access   public

+     */

+    function setCurlOption($option, $value) {

+        $this->debug("setCurlOption option=$option, value=");

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

+        $this->curl_options[$option] = $value;

+    }

 

-	/**

-	* set the SOAP headers

-	*

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

-	* @access   public

-	*/

-	function setHeaders($headers){

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

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

-		$this->requestHeaders = $headers;

-	}

+    /**

+     * sets the SOAP endpoint, which can override WSDL

+     *

+     * @param	string $endpoint The endpoint URL to use, or empty string or false to prevent override

+     * @access   public

+     */

+    function setEndpoint($endpoint) {

+        $this->debug("setEndpoint(\"$endpoint\")");

+        $this->forceEndpoint = $endpoint;

+    }

 

-	/**

-	* get the SOAP response headers (namespace resolution incomplete)

-	*

-	* @return	string

-	* @access   public

-	*/

-	function getHeaders(){

-		return $this->responseHeaders;

-	}

+    /**

+     * set the SOAP headers

+     *

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

+     * @access   public

+     */

+    function setHeaders($headers){

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

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

+        $this->requestHeaders = $headers;

+    }

 

-	/**

-	* get the SOAP response Header (parsed)

-	*

-	* @return	mixed

-	* @access   public

-	*/

-	function getHeader(){

-		return $this->responseHeader;

-	}

+    /**

+     * get the SOAP response headers (namespace resolution incomplete)

+     *

+     * @return	string

+     * @access   public

+     */

+    function getHeaders(){

+        return $this->responseHeaders;

+    }

 

-	/**

-	* set proxy info here

-	*

-	* @param    string $proxyhost

-	* @param    string $proxyport

-	* @param	string $proxyusername

-	* @param	string $proxypassword

-	* @access   public

-	*/

-	function setHTTPProxy($proxyhost, $proxyport, $proxyusername = '', $proxypassword = '') {

-		$this->proxyhost = $proxyhost;

-		$this->proxyport = $proxyport;

-		$this->proxyusername = $proxyusername;

-		$this->proxypassword = $proxypassword;

-	}

+    /**

+     * get the SOAP response Header (parsed)

+     *

+     * @return	mixed

+     * @access   public

+     */

+    function getHeader(){

+        return $this->responseHeader;

+    }

 

-	/**

-	* 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, 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;

-	}

+    /**

+     * set proxy info here

+     *

+     * @param    string $proxyhost

+     * @param    string $proxyport

+     * @param	string $proxyusername

+     * @param	string $proxypassword

+     * @access   public

+     */

+    function setHTTPProxy($proxyhost, $proxyport, $proxyusername = '', $proxypassword = '') {

+        $this->proxyhost = $proxyhost;

+        $this->proxyport = $proxyport;

+        $this->proxyusername = $proxyusername;

+        $this->proxypassword = $proxypassword;

+    }

 

-	/**

-	* use HTTP encoding

-	*

-	* @param    string $enc HTTP encoding

-	* @access   public

-	*/

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

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

-		$this->http_encoding = $enc;

-	}

+    /**

+     * 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, 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;

+    }

 

-	/**

-	* Set whether to try to use cURL connections if possible

-	*

-	* @param	boolean $use Whether to try to use cURL

-	* @access   public

-	*/

-	function setUseCURL($use) {

-		$this->debug("setUseCURL($use)");

-		$this->use_curl = $use;

-	}

+    /**

+     * use HTTP encoding

+     *

+     * @param    string $enc HTTP encoding

+     * @access   public

+     */

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

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

+        $this->http_encoding = $enc;

+    }

 

-	/**

-	* use HTTP persistent connections if possible

-	*

-	* @access   public

-	*/

-	function useHTTPPersistentConnection(){

-		$this->debug("useHTTPPersistentConnection");

-		$this->persistentConnection = true;

-	}

+    /**

+     * Set whether to try to use cURL connections if possible

+     *

+     * @param	boolean $use Whether to try to use cURL

+     * @access   public

+     */

+    function setUseCURL($use) {

+        $this->debug("setUseCURL($use)");

+        $this->use_curl = $use;

+    }

 

-	/**

-	* gets the default RPC parameter setting.

-	* If true, default is that call params are like RPC even for document style.

-	* Each call() can override this value.

-	*

-	* This is no longer used.

-	*

-	* @return boolean

-	* @access public

-	* @deprecated

-	*/

-	function getDefaultRpcParams() {

-		return $this->defaultRpcParams;

-	}

+    /**

+     * use HTTP persistent connections if possible

+     *

+     * @access   public

+     */

+    function useHTTPPersistentConnection(){

+        $this->debug("useHTTPPersistentConnection");

+        $this->persistentConnection = true;

+    }

 

-	/**

-	* sets the default RPC parameter setting.

-	* If true, default is that call params are like RPC even for document style

-	* Each call() can override this value.

-	*

-	* This is no longer used.

-	*

-	* @param    boolean $rpcParams

-	* @access public

-	* @deprecated

-	*/

-	function setDefaultRpcParams($rpcParams) {

-		$this->defaultRpcParams = $rpcParams;

-	}

+    /**

+     * gets the default RPC parameter setting.

+     * If true, default is that call params are like RPC even for document style.

+     * Each call() can override this value.

+     *

+     * This is no longer used.

+     *

+     * @return boolean

+     * @access public

+     * @deprecated

+     */

+    function getDefaultRpcParams() {

+        return $this->defaultRpcParams;

+    }

 

-	/**

-	* dynamically creates an instance of a proxy class,

-	* allowing user to directly call methods from wsdl

-	*

-	* @return   object soap_proxy object

-	* @access   public

-	*/

-	function getProxy() {

-		$r = rand();

-		$evalStr = $this->_getProxyClassCode($r);

-		//$this->debug("proxy class: $evalStr");

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

-			$this->debug("Error from _getProxyClassCode, so return NULL");

-			return null;

-		}

-		// eval the class

-		eval($evalStr);

-		// instantiate proxy object

-		eval("\$proxy = new nusoap_proxy_$r('');");

-		// transfer current wsdl data to the proxy thereby avoiding parsing the wsdl twice

-		$proxy->endpointType = 'wsdl';

-		$proxy->wsdlFile = $this->wsdlFile;

-		$proxy->wsdl = $this->wsdl;

-		$proxy->operations = $this->operations;

-		$proxy->defaultRpcParams = $this->defaultRpcParams;

-		// transfer other state

-		$proxy->soap_defencoding = $this->soap_defencoding;

-		$proxy->username = $this->username;

-		$proxy->password = $this->password;

-		$proxy->authtype = $this->authtype;

-		$proxy->certRequest = $this->certRequest;

-		$proxy->requestHeaders = $this->requestHeaders;

-		$proxy->endpoint = $this->endpoint;

-		$proxy->forceEndpoint = $this->forceEndpoint;

-		$proxy->proxyhost = $this->proxyhost;

-		$proxy->proxyport = $this->proxyport;

-		$proxy->proxyusername = $this->proxyusername;

-		$proxy->proxypassword = $this->proxypassword;

-		$proxy->http_encoding = $this->http_encoding;

-		$proxy->timeout = $this->timeout;

-		$proxy->response_timeout = $this->response_timeout;

-		$proxy->persistentConnection = &$this->persistentConnection;

-		$proxy->decode_utf8 = $this->decode_utf8;

-		$proxy->curl_options = $this->curl_options;

-		$proxy->bindingType = $this->bindingType;

-		$proxy->use_curl = $this->use_curl;

-		return $proxy;

-	}

+    /**

+     * sets the default RPC parameter setting.

+     * If true, default is that call params are like RPC even for document style

+     * Each call() can override this value.

+     *

+     * This is no longer used.

+     *

+     * @param    boolean $rpcParams

+     * @access public

+     * @deprecated

+     */

+    function setDefaultRpcParams($rpcParams) {

+        $this->defaultRpcParams = $rpcParams;

+    }

+

+    /**

+     * dynamically creates an instance of a proxy class,

+     * allowing user to directly call methods from wsdl

+     *

+     * @return   object soap_proxy object

+     * @access   public

+     */

+    function getProxy() {

+        $r = rand();

+        $evalStr = $this->_getProxyClassCode($r);

+        //$this->debug("proxy class: $evalStr");

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

+            $this->debug("Error from _getProxyClassCode, so return NULL");

+            return null;

+        }

+        // eval the class

+        eval($evalStr);

+        // instantiate proxy object

+        eval("\$proxy = new nusoap_proxy_$r('');");

+        // transfer current wsdl data to the proxy thereby avoiding parsing the wsdl twice

+        $proxy->endpointType = 'wsdl';

+        $proxy->wsdlFile = $this->wsdlFile;

+        $proxy->wsdl = $this->wsdl;

+        $proxy->operations = $this->operations;

+        $proxy->defaultRpcParams = $this->defaultRpcParams;

+        // transfer other state

+        $proxy->soap_defencoding = $this->soap_defencoding;

+        $proxy->username = $this->username;

+        $proxy->password = $this->password;

+        $proxy->authtype = $this->authtype;

+        $proxy->certRequest = $this->certRequest;

+        $proxy->requestHeaders = $this->requestHeaders;

+        $proxy->endpoint = $this->endpoint;

+        $proxy->forceEndpoint = $this->forceEndpoint;

+        $proxy->proxyhost = $this->proxyhost;

+        $proxy->proxyport = $this->proxyport;

+        $proxy->proxyusername = $this->proxyusername;

+        $proxy->proxypassword = $this->proxypassword;

+        $proxy->http_encoding = $this->http_encoding;

+        $proxy->timeout = $this->timeout;

+        $proxy->response_timeout = $this->response_timeout;

+        $proxy->persistentConnection = &$this->persistentConnection;

+        $proxy->decode_utf8 = $this->decode_utf8;

+        $proxy->curl_options = $this->curl_options;

+        $proxy->bindingType = $this->bindingType;

+        $proxy->use_curl = $this->use_curl;

+        return $proxy;

+    }

 

-	/**

-	* dynamically creates proxy class code

-	*

-	* @return   string PHP/NuSOAP code for the proxy class

-	* @access   private

-	*/

-	function _getProxyClassCode($r) {

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

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

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

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

-			$this->setError($evalStr);

-			$evalStr = "echo \"$evalStr\";";

-			return $evalStr;

-		}

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

-			$this->loadWSDL();

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

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

-			}

-		}

-		$evalStr = '';

-		foreach ($this->operations as $operation => $opData) {

-			if ($operation != '') {

-				// create param string and param comment string

-				if (sizeof($opData['input']['parts']) > 0) {

-					$paramStr = '';

-					$paramArrayStr = '';

-					$paramCommentStr = '';

-					foreach ($opData['input']['parts'] as $name => $type) {

-						$paramStr .= "\$$name, ";

-						$paramArrayStr .= "'$name' => \$$name, ";

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

-					}

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

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

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

-				} else {

-					$paramStr = '';

-					$paramArrayStr = '';

-					$paramCommentStr = 'void';

-				}

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

-				$evalStr .= "// $paramCommentStr

+    /**

+     * dynamically creates proxy class code

+     *

+     * @return   string PHP/NuSOAP code for the proxy class

+     * @access   private

+     */

+    function _getProxyClassCode($r) {

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

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

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

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

+            $this->setError($evalStr);

+            $evalStr = "echo \"$evalStr\";";

+            return $evalStr;

+        }

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

+            $this->loadWSDL();

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

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

+            }

+        }

+        $evalStr = '';

+        foreach ($this->operations as $operation => $opData) {

+            if ($operation != '') {

+                // create param string and param comment string

+                if (sizeof($opData['input']['parts']) > 0) {

+                    $paramStr = '';

+                    $paramArrayStr = '';

+                    $paramCommentStr = '';

+                    foreach ($opData['input']['parts'] as $name => $type) {

+                        $paramStr .= "\$$name, ";

+                        $paramArrayStr .= "'$name' => \$$name, ";

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

+                    }

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

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

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

+                } else {

+                    $paramStr = '';

+                    $paramArrayStr = '';

+                    $paramCommentStr = 'void';

+                }

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

+                $evalStr .= "// $paramCommentStr

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

 		\$params = array($paramArrayStr);

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

 	}

 	";

-				unset($paramStr);

-				unset($paramCommentStr);

-			}

-		}

-		$evalStr = 'class nusoap_proxy_'.$r.' extends nusoap_client {

+                unset($paramStr);

+                unset($paramCommentStr);

+            }

+        }

+        $evalStr = 'class nusoap_proxy_'.$r.' extends nusoap_client {

 	'.$evalStr.'

 }';

-		return $evalStr;

-	}

+        return $evalStr;

+    }

 

-	/**

-	* dynamically creates proxy class code

-	*

-	* @return   string PHP/NuSOAP code for the proxy class

-	* @access   public

-	*/

-	function getProxyClassCode() {

-		$r = rand();

-		return $this->_getProxyClassCode($r);

-	}

+    /**

+     * dynamically creates proxy class code

+     *

+     * @return   string PHP/NuSOAP code for the proxy class

+     * @access   public

+     */

+    function getProxyClassCode() {

+        $r = rand();

+        return $this->_getProxyClassCode($r);

+    }

 

-	/**

-	* gets the HTTP body for the current request.

-	*

-	* @param string $soapmsg The SOAP payload

-	* @return string The HTTP body, which includes the SOAP payload

-	* @access private

-	*/

-	function getHTTPBody($soapmsg) {

-		return $soapmsg;

-	}

+    /**

+     * gets the HTTP body for the current request.

+     *

+     * @param string $soapmsg The SOAP payload

+     * @return string The HTTP body, which includes the SOAP payload

+     * @access private

+     */

+    function getHTTPBody($soapmsg) {

+        return $soapmsg;

+    }

 

-	/**

-	* gets the HTTP content type for the current request.

-	*

-	* Note: getHTTPBody must be called before this.

-	*

-	* @return string the HTTP content type for the current request.

-	* @access private

-	*/

-	function getHTTPContentType() {

-		return 'text/xml';

-	}

+    /**

+     * gets the HTTP content type for the current request.

+     *

+     * Note: getHTTPBody must be called before this.

+     *

+     * @return string the HTTP content type for the current request.

+     * @access private

+     */

+    function getHTTPContentType() {

+        return 'text/xml';

+    }

 

-	/**

-	* gets the HTTP content type charset for the current request.

-	* returns false for non-text content types.

-	*

-	* Note: getHTTPBody must be called before this.

-	*

-	* @return string the HTTP content type charset for the current request.

-	* @access private

-	*/

-	function getHTTPContentTypeCharset() {

-		return $this->soap_defencoding;

-	}

+    /**

+     * gets the HTTP content type charset for the current request.

+     * returns false for non-text content types.

+     *

+     * Note: getHTTPBody must be called before this.

+     *

+     * @return string the HTTP content type charset for the current request.

+     * @access private

+     */

+    function getHTTPContentTypeCharset() {

+        return $this->soap_defencoding;

+    }

 

-	/*

+    /*

 	* whether or not parser should decode utf8 element content

     *

     * @return   always returns true

     * @access   public

     */

     function decodeUTF8($bool){

-		$this->decode_utf8 = $bool;

-		return true;

+        $this->decode_utf8 = $bool;

+        return true;

     }

 

-	/**

-	 * adds a new Cookie into $this->cookies array

-	 *

-	 * @param	string $name Cookie Name

-	 * @param	string $value Cookie Value

-	 * @return	boolean if cookie-set was successful returns true, else false

-	 * @access	public

-	 */

-	function setCookie($name, $value) {

-		if (strlen($name) == 0) {

-			return false;

-		}

-		$this->cookies[] = array('name' => $name, 'value' => $value);

-		return true;

-	}

+    /**

+     * adds a new Cookie into $this->cookies array

+     *

+     * @param	string $name Cookie Name

+     * @param	string $value Cookie Value

+     * @return	boolean if cookie-set was successful returns true, else false

+     * @access	public

+     */

+    function setCookie($name, $value) {

+        if (strlen($name) == 0) {

+            return false;

+        }

+        $this->cookies[] = array('name' => $name, 'value' => $value);

+        return true;

+    }

 

-	/**

-	 * gets all Cookies

-	 *

-	 * @return   array with all internal cookies

-	 * @access   public

-	 */

-	function getCookies() {

-		return $this->cookies;

-	}

+    /**

+     * gets all Cookies

+     *

+     * @return   array with all internal cookies

+     * @access   public

+     */

+    function getCookies() {

+        return $this->cookies;

+    }

 

-	/**

-	 * checks all Cookies and delete those which are expired

-	 *

-	 * @return   boolean always return true

-	 * @access   private

-	 */

-	function checkCookies() {

-		if (sizeof($this->cookies) == 0) {

-			return true;

-		}

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

-		$curr_cookies = $this->cookies;

-		$this->cookies = array();

-		foreach ($curr_cookies as $cookie) {

-			if (! is_array($cookie)) {

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

-				continue;

-			}

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

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

-					$this->cookies[] = $cookie;

-				} else {

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

-				}

-			} else {

-				$this->cookies[] = $cookie;

-			}

-		}

-		$this->debug('checkCookie: '.sizeof($this->cookies).' cookies left in array');

-		return true;

-	}

+    /**

+     * checks all Cookies and delete those which are expired

+     *

+     * @return   boolean always return true

+     * @access   private

+     */

+    function checkCookies() {

+        if (sizeof($this->cookies) == 0) {

+            return true;

+        }

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

+        $curr_cookies = $this->cookies;

+        $this->cookies = array();

+        foreach ($curr_cookies as $cookie) {

+            if (! is_array($cookie)) {

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

+                continue;

+            }

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

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

+                    $this->cookies[] = $cookie;

+                } else {

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

+                }

+            } else {

+                $this->cookies[] = $cookie;

+            }

+        }

+        $this->debug('checkCookie: '.sizeof($this->cookies).' cookies left in array');

+        return true;

+    }

 

-	/**

-	 * updates the current cookies with a new set

-	 *

-	 * @param	array $cookies new cookies with which to update current ones

-	 * @return	boolean always return true

-	 * @access	private

-	 */

-	function UpdateCookies($cookies) {

-		if (sizeof($this->cookies) == 0) {

-			// no existing cookies: take whatever is new

-			if (sizeof($cookies) > 0) {

-				$this->debug('Setting new cookie(s)');

-				$this->cookies = $cookies;

-			}

-			return true;

-		}

-		if (sizeof($cookies) == 0) {

-			// no new cookies: keep what we've got

-			return true;

-		}

-		// merge

-		foreach ($cookies as $newCookie) {

-			if (!is_array($newCookie)) {

-				continue;

-			}

-			if ((!isset($newCookie['name'])) || (!isset($newCookie['value']))) {

-				continue;

-			}

-			$newName = $newCookie['name'];

-

-			$found = false;

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

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

-				if (!is_array($cookie)) {

-					continue;

-				}

-				if (!isset($cookie['name'])) {

-					continue;

-				}

-				if ($newName != $cookie['name']) {

-					continue;

-				}

-				$newDomain = isset($newCookie['domain']) ? $newCookie['domain'] : 'NODOMAIN';

-				$domain = isset($cookie['domain']) ? $cookie['domain'] : 'NODOMAIN';

-				if ($newDomain != $domain) {

-					continue;

-				}

-				$newPath = isset($newCookie['path']) ? $newCookie['path'] : 'NOPATH';

-				$path = isset($cookie['path']) ? $cookie['path'] : 'NOPATH';

-				if ($newPath != $path) {

-					continue;

-				}

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

-				$found = true;

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

-				break;

-			}

-			if (! $found) {

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

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

-			}

-		}

-		return true;

-	}

+    /**

+     * updates the current cookies with a new set

+     *

+     * @param	array $cookies new cookies with which to update current ones

+     * @return	boolean always return true

+     * @access	private

+     */

+    function UpdateCookies($cookies) {

+        if (sizeof($this->cookies) == 0) {

+            // no existing cookies: take whatever is new

+            if (sizeof($cookies) > 0) {

+                $this->debug('Setting new cookie(s)');

+                $this->cookies = $cookies;

+            }

+            return true;

+        }

+        if (sizeof($cookies) == 0) {

+            // no new cookies: keep what we've got

+            return true;

+        }

+        // merge

+        foreach ($cookies as $newCookie) {

+            if (!is_array($newCookie)) {

+                continue;

+            }

+            if ((!isset($newCookie['name'])) || (!isset($newCookie['value']))) {

+                continue;

+            }

+            $newName = $newCookie['name'];

+

+            $found = false;

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

+                $cookie = $this->cookies[$i];

+                if (!is_array($cookie)) {

+                    continue;

+                }

+                if (!isset($cookie['name'])) {

+                    continue;

+                }

+                if ($newName != $cookie['name']) {

+                    continue;

+                }

+                $newDomain = isset($newCookie['domain']) ? $newCookie['domain'] : 'NODOMAIN';

+                $domain = isset($cookie['domain']) ? $cookie['domain'] : 'NODOMAIN';

+                if ($newDomain != $domain) {

+                    continue;

+                }

+                $newPath = isset($newCookie['path']) ? $newCookie['path'] : 'NOPATH';

+                $path = isset($cookie['path']) ? $cookie['path'] : 'NOPATH';

+                if ($newPath != $path) {

+                    continue;

+                }

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

+                $found = true;

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

+                break;

+            }

+            if (! $found) {

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

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

+            }

+        }

+        return true;

+    }

 }

 

 if (!extension_loaded('soap')) {

-	/**

-	 *	For backwards compatiblity, define soapclient unless the PHP SOAP extension is loaded.

-	 */

-	class soapclient extends nusoap_client {

-	}

+    /**

+     *	For backwards compatiblity, define soapclient unless the PHP SOAP extension is loaded.

+     */

+    class soapclient extends nusoap_client {

+    }

 }

 ?>

Spacing +105 added lines, -105 removed lines

@@ -22,37 +22,37 @@ 
 */

 class nusoap_client extends nusoap_base

 {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 	var $endpoint;

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

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

     var $proxyhost = '';

     var $proxyport = '';

 	var $proxyusername = '';

 	var $proxypassword = '';

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

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

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

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

 	var $http_encoding = false;

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

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

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

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

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

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

 	var $persistentConnection = false;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 

 	/*

 	 * fault related variables

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

 	* @access   public

 	*/

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

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

 		parent::__construct();

 		$this->endpoint = $endpoint;

 		$this->proxyhost = $proxyhost;

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

 

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

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

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

 

 		// make values

-		if($wsdl){

+		if ($wsdl) {

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

 				$this->wsdl = $endpoint;

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

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

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

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

 				$this->checkWSDL();

 			} else {

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

 				$this->wsdl = null;

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

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

 			}

 			$this->endpointType = 'wsdl';

 		} else {

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

 	* @access   public

 	*/

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

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

 		$this->operation = $operation;

 		$this->fault = false;

 		$this->setError('');

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

 

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

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

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

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

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

 		if ($headers) {

 			$this->requestHeaders = $headers;

 		}

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

 		}

 		// serialize parameters

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

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

 			// use WSDL for operation

 			$this->opData = $opData;

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

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

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

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

 				$soapAction = $opData['soapAction'];

 			}

-			if (! $this->forceEndpoint) {

+			if (!$this->forceEndpoint) {

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

 			} else {

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

 			}

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

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

 			$style = $opData['style'];

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

 			// add ns to ns array

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

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

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

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

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

 			}

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

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

 			} elseif (is_array($params)) {

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

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

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

 			} else {

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

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

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

 				return false;

 			}

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

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

 			// operation not in WSDL

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

 			$this->wsdl->clearDebug();

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

 			// no WSDL

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

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

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

 			// serialize

 			$payload = '';

 			if (is_string($params)) {

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

 			} elseif (is_array($params)) {

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

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

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

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

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

 				}

 			} else {

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

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

 				if ($namespace) {

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

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

-								$payload .

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

+								$payload.

 								"</$nsPrefix:$operation>";

 				} else {

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

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

 				}

 			} else {

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

 				if ($namespace) {

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

-								$payload .

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

+								$payload.

 								"</$nsPrefix:$operation>";

 				} else {

-					$payload = "<$operation>" .

-								$payload .

+					$payload = "<$operation>".

+								$payload.

 								"</$operation>";

 				}

 			}

 		}

 		// serialize envelope

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

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

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

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

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

 		// send

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

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

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

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

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

 			return false;

 		} else {

 			$this->return = $return;

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

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

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

 

 			// fault?

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

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

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

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

 				$this->fault = true;

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

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

 					$this->$k = $v;

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

 				}

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

 			} else {

 				// array of return values

-				if(is_array($return)){

+				if (is_array($return)) {

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

 					// in the array

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

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

 						return $return;

 					}

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

@@ -369,7 +369,7 @@ 
 	 */

 	function loadWSDL() {

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

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

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

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

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

 		$this->checkWSDL();

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

 	* @access   public

 	*/

-	function getOperationData($operation){

+	function getOperationData($operation) {

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

 			$this->loadWSDL();

 			if ($this->getError())

 				return false;

 		}

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

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

 			return $this->operations[$operation];

 		}

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

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

 	* @access   private

 	*/

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

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

 		$this->checkCookies();

 		// detect transport

-		switch(true){

+		switch (true) {

 			// http(s)

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

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

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

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

-					$http =& $this->persistentConnection;

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

+					$http = & $this->persistentConnection;

 				} else {

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

 					if ($this->persistentConnection) {

@@ -425,27 +425,27 @@ 
 				}

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

 				$http->setSOAPAction($soapaction);

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

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

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

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

 				}

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

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

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

 				}

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

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

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

 				}

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

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

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

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

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

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

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

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

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

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

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

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

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

 					//} else

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

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

 				} else {

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

 				}

@@ -462,13 +462,13 @@ 
 					}

 				}

 

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

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

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

 					return false;

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

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

 					return false;

 				} else {

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

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

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

 				}

 			break;

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

 	*/

     function parseResponse($headers, $data) {

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

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

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

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

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

 			return false;

     	}

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

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

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

 			return false;

 		}

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

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

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

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

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

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

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

 			} else {

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

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

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

 		}

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

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

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

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

 		// add parser debug data to our debug

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

 		// if parse errors

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

-			$this->setError( $errstr);

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

+			$this->setError($errstr);

 			// destroy the parser object

 			unset($parser);

 			return false;

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

 	* @access   public

 	*/

-	function setHeaders($headers){

+	function setHeaders($headers) {

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

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

 		$this->requestHeaders = $headers;

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

 	* @access   public

 	*/

-	function getHeaders(){

+	function getHeaders() {

 		return $this->responseHeaders;

 	}

 

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

 	* @access   public

 	*/

-	function getHeader(){

+	function getHeader() {

 		return $this->responseHeader;

 	}

 

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

 	* @access   public

 	*/

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

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

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

 		$this->http_encoding = $enc;

 	}

@@ -653,7 +653,7 @@ 
 	*

 	* @access   public

 	*/

-	function useHTTPPersistentConnection(){

+	function useHTTPPersistentConnection() {

 		$this->debug("useHTTPPersistentConnection");

 		$this->persistentConnection = true;

 	}

@@ -745,7 +745,7 @@ 
 	*/

 	function _getProxyClassCode($r) {

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

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

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

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

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

 			$this->setError($evalStr);

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

 			$this->loadWSDL();

 			if ($this->getError()) {

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

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

 			}

 		}

 		$evalStr = '';

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

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

 					}

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

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

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

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

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

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

 				} else {

 					$paramStr = '';

 					$paramArrayStr = '';

@@ -781,7 +781,7 @@ 
 				}

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

 				$evalStr .= "// $paramCommentStr

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

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

 		\$params = array($paramArrayStr);

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

 	}

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

     * @access   public

     */

-    function decodeUTF8($bool){

+    function decodeUTF8($bool) {

 		$this->decode_utf8 = $bool;

 		return true;

     }

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

 			return true;

 		}

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

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

 		$curr_cookies = $this->cookies;

 		$this->cookies = array();

 		foreach ($curr_cookies as $cookie) {

-			if (! is_array($cookie)) {

+			if (!is_array($cookie)) {

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

 				continue;

 			}

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

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

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

 					$this->cookies[] = $cookie;

 				} else {

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

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

 				}

 			} else {

 				$this->cookies[] = $cookie;

@@ -966,11 +966,11 @@ 
 				}

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

 				$found = true;

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

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

 				break;

 			}

-			if (! $found) {

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

+			if (!$found) {

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

 				$this->cookies[] = $newCookie;

 			}

 		}

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

Braces +39 added lines, -29 removed lines

@@ -159,10 +159,12 @@ 
 	* @access	private

 	*/

 	function io_method() {

-		if ($this->use_curl || ($this->scheme == 'https') || ($this->scheme == 'http' && $this->authtype == 'ntlm') || ($this->scheme == 'http' && is_array($this->proxy) && $this->proxy['authtype'] == 'ntlm'))

-			return 'curl';

-		if (($this->scheme == 'http' || $this->scheme == 'ssl') && $this->authtype != 'ntlm' && (!is_array($this->proxy) || $this->proxy['authtype'] != 'ntlm'))

-			return 'socket';

+		if ($this->use_curl || ($this->scheme == 'https') || ($this->scheme == 'http' && $this->authtype == 'ntlm') || ($this->scheme == 'http' && is_array($this->proxy) && $this->proxy['authtype'] == 'ntlm')) {
+					return 'curl';
+		}
+		if (($this->scheme == 'http' || $this->scheme == 'ssl') && $this->authtype != 'ntlm' && (!is_array($this->proxy) || $this->proxy['authtype'] != 'ntlm')) {
+					return 'socket';
+		}
 		return 'unknown';

 	}

 

@@ -246,30 +248,36 @@ 
 			return false;

 		}

 		// Avoid warnings when PHP does not have these options

-		if (defined('CURLOPT_CONNECTIONTIMEOUT'))

-			$CURLOPT_CONNECTIONTIMEOUT = CURLOPT_CONNECTIONTIMEOUT;

-		else

-			$CURLOPT_CONNECTIONTIMEOUT = 78;

-		if (defined('CURLOPT_HTTPAUTH'))

-			$CURLOPT_HTTPAUTH = CURLOPT_HTTPAUTH;

-		else

-			$CURLOPT_HTTPAUTH = 107;

-		if (defined('CURLOPT_PROXYAUTH'))

-			$CURLOPT_PROXYAUTH = CURLOPT_PROXYAUTH;

-		else

-			$CURLOPT_PROXYAUTH = 111;

-		if (defined('CURLAUTH_BASIC'))

-			$CURLAUTH_BASIC = CURLAUTH_BASIC;

-		else

-			$CURLAUTH_BASIC = 1;

-		if (defined('CURLAUTH_DIGEST'))

-			$CURLAUTH_DIGEST = CURLAUTH_DIGEST;

-		else

-			$CURLAUTH_DIGEST = 2;

-		if (defined('CURLAUTH_NTLM'))

-			$CURLAUTH_NTLM = CURLAUTH_NTLM;

-		else

-			$CURLAUTH_NTLM = 8;

+		if (defined('CURLOPT_CONNECTIONTIMEOUT')) {
+					$CURLOPT_CONNECTIONTIMEOUT = CURLOPT_CONNECTIONTIMEOUT;
+		} else {
+					$CURLOPT_CONNECTIONTIMEOUT = 78;
+		}
+		if (defined('CURLOPT_HTTPAUTH')) {
+					$CURLOPT_HTTPAUTH = CURLOPT_HTTPAUTH;
+		} else {
+					$CURLOPT_HTTPAUTH = 107;
+		}
+		if (defined('CURLOPT_PROXYAUTH')) {
+					$CURLOPT_PROXYAUTH = CURLOPT_PROXYAUTH;
+		} else {
+					$CURLOPT_PROXYAUTH = 111;
+		}
+		if (defined('CURLAUTH_BASIC')) {
+					$CURLAUTH_BASIC = CURLAUTH_BASIC;
+		} else {
+					$CURLAUTH_BASIC = 1;
+		}
+		if (defined('CURLAUTH_DIGEST')) {
+					$CURLAUTH_DIGEST = CURLAUTH_DIGEST;
+		} else {
+					$CURLAUTH_DIGEST = 2;
+		}
+		if (defined('CURLAUTH_NTLM')) {
+					$CURLAUTH_NTLM = CURLAUTH_NTLM;
+		} else {
+					$CURLAUTH_NTLM = 8;
+		}
 

 		$this->debug('connect using cURL');

 		// init CURL

@@ -612,7 +620,9 @@ 
 								'HTTP/1.0 200 Connection established');

 		foreach ($skipHeaders as $hd) {

 			$prefix = substr($data, 0, strlen($hd));

-			if ($prefix == $hd) return true;

+			if ($prefix == $hd) {
+			    return true;
+			}
 		}

 

 		return false;

Indentation +1262 added lines, -1262 removed lines

@@ -11,171 +11,171 @@ 
 */

 class soap_transport_http extends nusoap_base

 {

-	var $url = '';

-	var $uri = '';

-	var $digest_uri = '';

-	var $scheme = '';

-	var $host = '';

-	var $port = '';

-	var $path = '';

-	var $request_method = 'POST';

-	var $protocol_version = '1.0';

-	var $encoding = '';

-	var $outgoing_headers = array();

-	var $incoming_headers = array();

-	var $incoming_cookies = array();

-	var $outgoing_payload = '';

-	var $incoming_payload = '';

-	var $response_status_line;	// HTTP response status line

-	var $useSOAPAction = true;

-	var $persistentConnection = false;

-	var $ch = false;	// cURL handle

-	var $ch_options = array();	// cURL custom options

-	var $use_curl = false;		// force cURL use

-	var $proxy = null;			// proxy information (associative array)

-	var $username = '';

-	var $password = '';

-	var $authtype = '';

-	var $digestRequest = array();

-	var $certRequest = array();	// keys must be cainfofile (optional), sslcertfile, sslkeyfile, passphrase, certpassword (optional), verifypeer (optional), verifyhost (optional)

-								// cainfofile: certificate authority file, e.g. '$pathToPemFiles/rootca.pem'

-								// sslcertfile: SSL certificate file, e.g. '$pathToPemFiles/mycert.pem'

-								// sslkeyfile: SSL key file, e.g. '$pathToPemFiles/mykey.pem'

-								// passphrase: SSL key password/passphrase

-								// certpassword: SSL certificate password

-								// verifypeer: default is 1

-								// verifyhost: default is 1

-

-	/**

-	* constructor

-	*

-	* @param string $url The URL to which to connect

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

-	* @param boolean $use_curl Whether to try to force cURL use

-	* @access public

-	*/

-	function __construct($url, $curl_options = NULL, $use_curl = false){

-		parent::__construct();

-		$this->debug("ctor url=$url use_curl=$use_curl curl_options:");

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

-		$this->setURL($url);

-		if (is_array($curl_options)) {

-			$this->ch_options = $curl_options;

-		}

-		$this->use_curl = $use_curl;

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

-		$this->setHeader('User-Agent', $this->title.'/'.$this->version.' ('.$rev[1].')');

-	}

-

-	/**

-	* sets a cURL option

-	*

-	* @param	mixed $option The cURL option (always integer?)

-	* @param	mixed $value The cURL option value

-	* @access   private

-	*/

-	function setCurlOption($option, $value) {

-		$this->debug("setCurlOption option=$option, value=");

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

-		curl_setopt($this->ch, $option, $value);

-	}

-

-	/**

-	* sets an HTTP header

-	*

-	* @param string $name The name of the header

-	* @param string $value The value of the header

-	* @access private

-	*/

-	function setHeader($name, $value) {

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

-		$this->debug("set header $name: $value");

-	}

-

-	/**

-	* unsets an HTTP header

-	*

-	* @param string $name The name of the header

-	* @access private

-	*/

-	function unsetHeader($name) {

-		if (isset($this->outgoing_headers[$name])) {

-			$this->debug("unset header $name");

-			unset($this->outgoing_headers[$name]);

-		}

-	}

-

-	/**

-	* sets the URL to which to connect

-	*

-	* @param string $url The URL to which to connect

-	* @access private

-	*/

-	function setURL($url) {

-		$this->url = $url;

-

-		$u = parse_url($url);

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

-			$this->debug("parsed URL $k = $v");

-			$this->$k = $v;

-		}

-

-		// add any GET params to path

-		if(isset($u['query']) && $u['query'] != ''){

+    var $url = '';

+    var $uri = '';

+    var $digest_uri = '';

+    var $scheme = '';

+    var $host = '';

+    var $port = '';

+    var $path = '';

+    var $request_method = 'POST';

+    var $protocol_version = '1.0';

+    var $encoding = '';

+    var $outgoing_headers = array();

+    var $incoming_headers = array();

+    var $incoming_cookies = array();

+    var $outgoing_payload = '';

+    var $incoming_payload = '';

+    var $response_status_line;	// HTTP response status line

+    var $useSOAPAction = true;

+    var $persistentConnection = false;

+    var $ch = false;	// cURL handle

+    var $ch_options = array();	// cURL custom options

+    var $use_curl = false;		// force cURL use

+    var $proxy = null;			// proxy information (associative array)

+    var $username = '';

+    var $password = '';

+    var $authtype = '';

+    var $digestRequest = array();

+    var $certRequest = array();	// keys must be cainfofile (optional), sslcertfile, sslkeyfile, passphrase, certpassword (optional), verifypeer (optional), verifyhost (optional)

+                                // cainfofile: certificate authority file, e.g. '$pathToPemFiles/rootca.pem'

+                                // sslcertfile: SSL certificate file, e.g. '$pathToPemFiles/mycert.pem'

+                                // sslkeyfile: SSL key file, e.g. '$pathToPemFiles/mykey.pem'

+                                // passphrase: SSL key password/passphrase

+                                // certpassword: SSL certificate password

+                                // verifypeer: default is 1

+                                // verifyhost: default is 1

+

+    /**

+     * constructor

+     *

+     * @param string $url The URL to which to connect

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

+     * @param boolean $use_curl Whether to try to force cURL use

+     * @access public

+     */

+    function __construct($url, $curl_options = NULL, $use_curl = false){

+        parent::__construct();

+        $this->debug("ctor url=$url use_curl=$use_curl curl_options:");

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

+        $this->setURL($url);

+        if (is_array($curl_options)) {

+            $this->ch_options = $curl_options;

+        }

+        $this->use_curl = $use_curl;

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

+        $this->setHeader('User-Agent', $this->title.'/'.$this->version.' ('.$rev[1].')');

+    }

+

+    /**

+     * sets a cURL option

+     *

+     * @param	mixed $option The cURL option (always integer?)

+     * @param	mixed $value The cURL option value

+     * @access   private

+     */

+    function setCurlOption($option, $value) {

+        $this->debug("setCurlOption option=$option, value=");

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

+        curl_setopt($this->ch, $option, $value);

+    }

+

+    /**

+     * sets an HTTP header

+     *

+     * @param string $name The name of the header

+     * @param string $value The value of the header

+     * @access private

+     */

+    function setHeader($name, $value) {

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

+        $this->debug("set header $name: $value");

+    }

+

+    /**

+     * unsets an HTTP header

+     *

+     * @param string $name The name of the header

+     * @access private

+     */

+    function unsetHeader($name) {

+        if (isset($this->outgoing_headers[$name])) {

+            $this->debug("unset header $name");

+            unset($this->outgoing_headers[$name]);

+        }

+    }

+

+    /**

+     * sets the URL to which to connect

+     *

+     * @param string $url The URL to which to connect

+     * @access private

+     */

+    function setURL($url) {

+        $this->url = $url;

+

+        $u = parse_url($url);

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

+            $this->debug("parsed URL $k = $v");

+            $this->$k = $v;

+        }

+

+        // add any GET params to path

+        if(isset($u['query']) && $u['query'] != ''){

             $this->path .= '?' . $u['query'];

-		}

-

-		// set default port

-		if(!isset($u['port'])){

-			if($u['scheme'] == 'https'){

-				$this->port = 443;

-			} else {

-				$this->port = 80;

-			}

-		}

-

-		$this->uri = $this->path;

-		$this->digest_uri = $this->uri;

-

-		// build headers

-		if (!isset($u['port'])) {

-			$this->setHeader('Host', $this->host);

-		} else {

-			$this->setHeader('Host', $this->host.':'.$this->port);

-		}

-

-		if (isset($u['user']) && $u['user'] != '') {

-			$this->setCredentials(urldecode($u['user']), isset($u['pass']) ? urldecode($u['pass']) : '');

-		}

-	}

-

-	/**

-	* gets the I/O method to use

-	*

-	* @return	string	I/O method to use (socket|curl|unknown)

-	* @access	private

-	*/

-	function io_method() {

-		if ($this->use_curl || ($this->scheme == 'https') || ($this->scheme == 'http' && $this->authtype == 'ntlm') || ($this->scheme == 'http' && is_array($this->proxy) && $this->proxy['authtype'] == 'ntlm'))

-			return 'curl';

-		if (($this->scheme == 'http' || $this->scheme == 'ssl') && $this->authtype != 'ntlm' && (!is_array($this->proxy) || $this->proxy['authtype'] != 'ntlm'))

-			return 'socket';

-		return 'unknown';

-	}

-

-	/**

-	* establish an HTTP connection

-	*

-	* @param    integer $timeout set connection timeout in seconds

-	* @param	integer $response_timeout set response timeout in seconds

-	* @return	boolean true if connected, false if not

-	* @access   private

-	*/

-	function connect($connection_timeout=0,$response_timeout=30){

-	  	// For PHP 4.3 with OpenSSL, change https scheme to ssl, then treat like

-	  	// "regular" socket.

-	  	// TODO: disabled for now because OpenSSL must be *compiled* in (not just

-	  	//       loaded), and until PHP5 stream_get_wrappers is not available.

+        }

+

+        // set default port

+        if(!isset($u['port'])){

+            if($u['scheme'] == 'https'){

+                $this->port = 443;

+            } else {

+                $this->port = 80;

+            }

+        }

+

+        $this->uri = $this->path;

+        $this->digest_uri = $this->uri;

+

+        // build headers

+        if (!isset($u['port'])) {

+            $this->setHeader('Host', $this->host);

+        } else {

+            $this->setHeader('Host', $this->host.':'.$this->port);

+        }

+

+        if (isset($u['user']) && $u['user'] != '') {

+            $this->setCredentials(urldecode($u['user']), isset($u['pass']) ? urldecode($u['pass']) : '');

+        }

+    }

+

+    /**

+     * gets the I/O method to use

+     *

+     * @return	string	I/O method to use (socket|curl|unknown)

+     * @access	private

+     */

+    function io_method() {

+        if ($this->use_curl || ($this->scheme == 'https') || ($this->scheme == 'http' && $this->authtype == 'ntlm') || ($this->scheme == 'http' && is_array($this->proxy) && $this->proxy['authtype'] == 'ntlm'))

+            return 'curl';

+        if (($this->scheme == 'http' || $this->scheme == 'ssl') && $this->authtype != 'ntlm' && (!is_array($this->proxy) || $this->proxy['authtype'] != 'ntlm'))

+            return 'socket';

+        return 'unknown';

+    }

+

+    /**

+     * establish an HTTP connection

+     *

+     * @param    integer $timeout set connection timeout in seconds

+     * @param	integer $response_timeout set response timeout in seconds

+     * @return	boolean true if connected, false if not

+     * @access   private

+     */

+    function connect($connection_timeout=0,$response_timeout=30){

+            // For PHP 4.3 with OpenSSL, change https scheme to ssl, then treat like

+            // "regular" socket.

+            // TODO: disabled for now because OpenSSL must be *compiled* in (not just

+            //       loaded), and until PHP5 stream_get_wrappers is not available.

 //	  	if ($this->scheme == 'https') {

 //		  	if (version_compare(phpversion(), '4.3.0') >= 0) {

 //		  		if (extension_loaded('openssl')) {

@@ -184,1120 +184,1120 @@ 
 //		  		}

 //		  	}

 //		}

-		$this->debug("connect connection_timeout $connection_timeout, response_timeout $response_timeout, scheme $this->scheme, host $this->host, port $this->port");

-	  if ($this->io_method() == 'socket') {

-		if (!is_array($this->proxy)) {

-			$host = $this->host;

-			$port = $this->port;

-		} else {

-			$host = $this->proxy['host'];

-			$port = $this->proxy['port'];

-		}

-

-		// use persistent connection

-		if($this->persistentConnection && isset($this->fp) && is_resource($this->fp)){

-			if (!feof($this->fp)) {

-				$this->debug('Re-use persistent connection');

-				return true;

-			}

-			fclose($this->fp);

-			$this->debug('Closed persistent connection at EOF');

-		}

-

-		// munge host if using OpenSSL

-		if ($this->scheme == 'ssl') {

-			$host = 'ssl://' . $host;

-		}

-		$this->debug('calling fsockopen with host ' . $host . ' connection_timeout ' . $connection_timeout);

-

-		// open socket

-		if($connection_timeout > 0){

-			$this->fp = @fsockopen( $host, $this->port, $this->errno, $this->error_str, $connection_timeout);

-		} else {

-			$this->fp = @fsockopen( $host, $this->port, $this->errno, $this->error_str);

-		}

-

-		// test pointer

-		if(!$this->fp) {

-			$msg = 'Couldn\'t open socket connection to server ' . $this->url;

-			if ($this->errno) {

-				$msg .= ', Error ('.$this->errno.'): '.$this->error_str;

-			} else {

-				$msg .= ' prior to connect().  This is often a problem looking up the host name.';

-			}

-			$this->debug($msg);

-			$this->setError($msg);

-			return false;

-		}

-

-		// set response timeout

-		$this->debug('set response timeout to ' . $response_timeout);

-		socket_set_timeout( $this->fp, $response_timeout);

-

-		$this->debug('socket connected');

-		return true;

-	  } else if ($this->io_method() == 'curl') {

-		if (!extension_loaded('curl')) {

+        $this->debug("connect connection_timeout $connection_timeout, response_timeout $response_timeout, scheme $this->scheme, host $this->host, port $this->port");

+        if ($this->io_method() == 'socket') {

+        if (!is_array($this->proxy)) {

+            $host = $this->host;

+            $port = $this->port;

+        } else {

+            $host = $this->proxy['host'];

+            $port = $this->proxy['port'];

+        }

+

+        // use persistent connection

+        if($this->persistentConnection && isset($this->fp) && is_resource($this->fp)){

+            if (!feof($this->fp)) {

+                $this->debug('Re-use persistent connection');

+                return true;

+            }

+            fclose($this->fp);

+            $this->debug('Closed persistent connection at EOF');

+        }

+

+        // munge host if using OpenSSL

+        if ($this->scheme == 'ssl') {

+            $host = 'ssl://' . $host;

+        }

+        $this->debug('calling fsockopen with host ' . $host . ' connection_timeout ' . $connection_timeout);

+

+        // open socket

+        if($connection_timeout > 0){

+            $this->fp = @fsockopen( $host, $this->port, $this->errno, $this->error_str, $connection_timeout);

+        } else {

+            $this->fp = @fsockopen( $host, $this->port, $this->errno, $this->error_str);

+        }

+

+        // test pointer

+        if(!$this->fp) {

+            $msg = 'Couldn\'t open socket connection to server ' . $this->url;

+            if ($this->errno) {

+                $msg .= ', Error ('.$this->errno.'): '.$this->error_str;

+            } else {

+                $msg .= ' prior to connect().  This is often a problem looking up the host name.';

+            }

+            $this->debug($msg);

+            $this->setError($msg);

+            return false;

+        }

+

+        // set response timeout

+        $this->debug('set response timeout to ' . $response_timeout);

+        socket_set_timeout( $this->fp, $response_timeout);

+

+        $this->debug('socket connected');

+        return true;

+        } else if ($this->io_method() == 'curl') {

+        if (!extension_loaded('curl')) {

 //			$this->setError('cURL Extension, or OpenSSL extension w/ PHP version >= 4.3 is required for HTTPS');

-			$this->setError('The PHP cURL Extension is required for HTTPS or NLTM.  You will need to re-build or update your PHP to include cURL or change php.ini to load the PHP cURL extension.');

-			return false;

-		}

-		// Avoid warnings when PHP does not have these options

-		if (defined('CURLOPT_CONNECTIONTIMEOUT'))

-			$CURLOPT_CONNECTIONTIMEOUT = CURLOPT_CONNECTIONTIMEOUT;

-		else

-			$CURLOPT_CONNECTIONTIMEOUT = 78;

-		if (defined('CURLOPT_HTTPAUTH'))

-			$CURLOPT_HTTPAUTH = CURLOPT_HTTPAUTH;

-		else

-			$CURLOPT_HTTPAUTH = 107;

-		if (defined('CURLOPT_PROXYAUTH'))

-			$CURLOPT_PROXYAUTH = CURLOPT_PROXYAUTH;

-		else

-			$CURLOPT_PROXYAUTH = 111;

-		if (defined('CURLAUTH_BASIC'))

-			$CURLAUTH_BASIC = CURLAUTH_BASIC;

-		else

-			$CURLAUTH_BASIC = 1;

-		if (defined('CURLAUTH_DIGEST'))

-			$CURLAUTH_DIGEST = CURLAUTH_DIGEST;

-		else

-			$CURLAUTH_DIGEST = 2;

-		if (defined('CURLAUTH_NTLM'))

-			$CURLAUTH_NTLM = CURLAUTH_NTLM;

-		else

-			$CURLAUTH_NTLM = 8;

-

-		$this->debug('connect using cURL');

-		// init CURL

-		$this->ch = curl_init();

-		// set url

-		$hostURL = ($this->port != '') ? "$this->scheme://$this->host:$this->port" : "$this->scheme://$this->host";

-		// add path

-		$hostURL .= $this->path;

-		$this->setCurlOption(CURLOPT_URL, $hostURL);

-		// follow location headers (re-directs)

-		if (ini_get('safe_mode') || ini_get('open_basedir')) {

-			$this->debug('safe_mode or open_basedir set, so do not set CURLOPT_FOLLOWLOCATION');

-			$this->debug('safe_mode = ');

-			$this->appendDebug($this->varDump(ini_get('safe_mode')));

-			$this->debug('open_basedir = ');

-			$this->appendDebug($this->varDump(ini_get('open_basedir')));

-		} else {

-			$this->setCurlOption(CURLOPT_FOLLOWLOCATION, 1);

-		}

-		// ask for headers in the response output

-		$this->setCurlOption(CURLOPT_HEADER, 1);

-		// ask for the response output as the return value

-		$this->setCurlOption(CURLOPT_RETURNTRANSFER, 1);

-		// encode

-		// We manage this ourselves through headers and encoding

+            $this->setError('The PHP cURL Extension is required for HTTPS or NLTM.  You will need to re-build or update your PHP to include cURL or change php.ini to load the PHP cURL extension.');

+            return false;

+        }

+        // Avoid warnings when PHP does not have these options

+        if (defined('CURLOPT_CONNECTIONTIMEOUT'))

+            $CURLOPT_CONNECTIONTIMEOUT = CURLOPT_CONNECTIONTIMEOUT;

+        else

+            $CURLOPT_CONNECTIONTIMEOUT = 78;

+        if (defined('CURLOPT_HTTPAUTH'))

+            $CURLOPT_HTTPAUTH = CURLOPT_HTTPAUTH;

+        else

+            $CURLOPT_HTTPAUTH = 107;

+        if (defined('CURLOPT_PROXYAUTH'))

+            $CURLOPT_PROXYAUTH = CURLOPT_PROXYAUTH;

+        else

+            $CURLOPT_PROXYAUTH = 111;

+        if (defined('CURLAUTH_BASIC'))

+            $CURLAUTH_BASIC = CURLAUTH_BASIC;

+        else

+            $CURLAUTH_BASIC = 1;

+        if (defined('CURLAUTH_DIGEST'))

+            $CURLAUTH_DIGEST = CURLAUTH_DIGEST;

+        else

+            $CURLAUTH_DIGEST = 2;

+        if (defined('CURLAUTH_NTLM'))

+            $CURLAUTH_NTLM = CURLAUTH_NTLM;

+        else

+            $CURLAUTH_NTLM = 8;

+

+        $this->debug('connect using cURL');

+        // init CURL

+        $this->ch = curl_init();

+        // set url

+        $hostURL = ($this->port != '') ? "$this->scheme://$this->host:$this->port" : "$this->scheme://$this->host";

+        // add path

+        $hostURL .= $this->path;

+        $this->setCurlOption(CURLOPT_URL, $hostURL);

+        // follow location headers (re-directs)

+        if (ini_get('safe_mode') || ini_get('open_basedir')) {

+            $this->debug('safe_mode or open_basedir set, so do not set CURLOPT_FOLLOWLOCATION');

+            $this->debug('safe_mode = ');

+            $this->appendDebug($this->varDump(ini_get('safe_mode')));

+            $this->debug('open_basedir = ');

+            $this->appendDebug($this->varDump(ini_get('open_basedir')));

+        } else {

+            $this->setCurlOption(CURLOPT_FOLLOWLOCATION, 1);

+        }

+        // ask for headers in the response output

+        $this->setCurlOption(CURLOPT_HEADER, 1);

+        // ask for the response output as the return value

+        $this->setCurlOption(CURLOPT_RETURNTRANSFER, 1);

+        // encode

+        // We manage this ourselves through headers and encoding

 //		if(function_exists('gzuncompress')){

 //			$this->setCurlOption(CURLOPT_ENCODING, 'deflate');

 //		}

-		// persistent connection

-		if ($this->persistentConnection) {

-			// I believe the following comment is now bogus, having applied to

-			// the code when it used CURLOPT_CUSTOMREQUEST to send the request.

-			// The way we send data, we cannot use persistent connections, since

-			// there will be some "junk" at the end of our request.

-			//$this->setCurlOption(CURL_HTTP_VERSION_1_1, true);

-			$this->persistentConnection = false;

-			$this->setHeader('Connection', 'close');

-		}

-		// set timeouts

-		if ($connection_timeout != 0) {

-			$this->setCurlOption($CURLOPT_CONNECTIONTIMEOUT, $connection_timeout);

-		}

-		if ($response_timeout != 0) {

-			$this->setCurlOption(CURLOPT_TIMEOUT, $response_timeout);

-		}

-

-		if ($this->scheme == 'https') {

-			$this->debug('set cURL SSL verify options');

-			// recent versions of cURL turn on peer/host checking by default,

-			// while PHP binaries are not compiled with a default location for the

-			// CA cert bundle, so disable peer/host checking.

-			//$this->setCurlOption(CURLOPT_CAINFO, 'f:\php-4.3.2-win32\extensions\curl-ca-bundle.crt');

-			$this->setCurlOption(CURLOPT_SSL_VERIFYPEER, 0);

-			$this->setCurlOption(CURLOPT_SSL_VERIFYHOST, 0);

-

-			// support client certificates (thanks Tobias Boes, Doug Anarino, Eryan Ariobowo)

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

-				$this->debug('set cURL certificate options');

-				if (isset($this->certRequest['cainfofile'])) {

-					$this->setCurlOption(CURLOPT_CAINFO, $this->certRequest['cainfofile']);

-				}

-				if (isset($this->certRequest['verifypeer'])) {

-					$this->setCurlOption(CURLOPT_SSL_VERIFYPEER, $this->certRequest['verifypeer']);

-				} else {

-					$this->setCurlOption(CURLOPT_SSL_VERIFYPEER, 1);

-				}

-				if (isset($this->certRequest['verifyhost'])) {

-					$this->setCurlOption(CURLOPT_SSL_VERIFYHOST, $this->certRequest['verifyhost']);

-				} else {

-					$this->setCurlOption(CURLOPT_SSL_VERIFYHOST, 1);

-				}

-				if (isset($this->certRequest['sslcertfile'])) {

-					$this->setCurlOption(CURLOPT_SSLCERT, $this->certRequest['sslcertfile']);

-				}

-				if (isset($this->certRequest['sslkeyfile'])) {

-					$this->setCurlOption(CURLOPT_SSLKEY, $this->certRequest['sslkeyfile']);

-				}

-				if (isset($this->certRequest['passphrase'])) {

-					$this->setCurlOption(CURLOPT_SSLKEYPASSWD, $this->certRequest['passphrase']);

-				}

-				if (isset($this->certRequest['certpassword'])) {

-					$this->setCurlOption(CURLOPT_SSLCERTPASSWD, $this->certRequest['certpassword']);

-				}

-			}

-		}

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

-			if ($this->username) {

-				$this->debug('set cURL username/password');

-				$this->setCurlOption(CURLOPT_USERPWD, "$this->username:$this->password");

-			}

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

-				$this->debug('set cURL for Basic authentication');

-				$this->setCurlOption($CURLOPT_HTTPAUTH, $CURLAUTH_BASIC);

-			}

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

-				$this->debug('set cURL for digest authentication');

-				$this->setCurlOption($CURLOPT_HTTPAUTH, $CURLAUTH_DIGEST);

-			}

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

-				$this->debug('set cURL for NTLM authentication');

-				$this->setCurlOption($CURLOPT_HTTPAUTH, $CURLAUTH_NTLM);

-			}

-		}

-		if (is_array($this->proxy)) {

-			$this->debug('set cURL proxy options');

-			if ($this->proxy['port'] != '') {

-				$this->setCurlOption(CURLOPT_PROXY, $this->proxy['host'].':'.$this->proxy['port']);

-			} else {

-				$this->setCurlOption(CURLOPT_PROXY, $this->proxy['host']);

-			}

-			if ($this->proxy['username'] || $this->proxy['password']) {

-				$this->debug('set cURL proxy authentication options');

-				$this->setCurlOption(CURLOPT_PROXYUSERPWD, $this->proxy['username'].':'.$this->proxy['password']);

-				if ($this->proxy['authtype'] == 'basic') {

-					$this->setCurlOption($CURLOPT_PROXYAUTH, $CURLAUTH_BASIC);

-				}

-				if ($this->proxy['authtype'] == 'ntlm') {

-					$this->setCurlOption($CURLOPT_PROXYAUTH, $CURLAUTH_NTLM);

-				}

-			}

-		}

-		$this->debug('cURL connection set up');

-		return true;

-	  } else {

-		$this->setError('Unknown scheme ' . $this->scheme);

-		$this->debug('Unknown scheme ' . $this->scheme);

-		return false;

-	  }

-	}

-

-	/**

-	* sends the SOAP request and gets the SOAP response via HTTP[S]

-	*

-	* @param    string $data message data

-	* @param    integer $timeout set connection timeout in seconds

-	* @param	integer $response_timeout set response timeout in seconds

-	* @param	array $cookies cookies to send

-	* @return	string data

-	* @access   public

-	*/

-	function send($data, $timeout=0, $response_timeout=30, $cookies=NULL) {

-

-		$this->debug('entered send() with data of length: '.strlen($data));

-

-		$this->tryagain = true;

-		$tries = 0;

-		while ($this->tryagain) {

-			$this->tryagain = false;

-			if ($tries++ < 2) {

-				// make connnection

-				if (!$this->connect($timeout, $response_timeout)){

-					return false;

-				}

-

-				// send request

-				if (!$this->sendRequest($data, $cookies)){

-					return false;

-				}

-

-				// get response

-				$respdata = $this->getResponse();

-			} else {

-				$this->setError("Too many tries to get an OK response ($this->response_status_line)");

-			}

-		}

-		$this->debug('end of send()');

-		return $respdata;

-	}

-

-

-	/**

-	* sends the SOAP request and gets the SOAP response via HTTPS using CURL

-	*

-	* @param    string $data message data

-	* @param    integer $timeout set connection timeout in seconds

-	* @param	integer $response_timeout set response timeout in seconds

-	* @param	array $cookies cookies to send

-	* @return	string data

-	* @access   public

-	* @deprecated

-	*/

-	function sendHTTPS($data, $timeout=0, $response_timeout=30, $cookies) {

-		return $this->send($data, $timeout, $response_timeout, $cookies);

-	}

-

-	/**

-	* if authenticating, set user credentials here

-	*

-	* @param    string $username

-	* @param    string $password

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

-	* @param	array $digestRequest (keys must be nonce, nc, realm, qop)

-	* @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', $digestRequest = array(), $certRequest = array()) {

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

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

-		$this->debug("certRequest=");

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

-		// cf. RFC 2617

-		if ($authtype == 'basic') {

-			$this->setHeader('Authorization', 'Basic '.base64_encode(str_replace(':','',$username).':'.$password));

-		} elseif ($authtype == 'digest') {

-			if (isset($digestRequest['nonce'])) {

-				$digestRequest['nc'] = isset($digestRequest['nc']) ? $digestRequest['nc']++ : 1;

-

-				// calculate the Digest hashes (calculate code based on digest implementation found at: http://www.rassoc.com/gregr/weblog/stories/2002/07/09/webServicesSecurityHttpDigestAuthenticationWithoutActiveDirectory.html)

-

-				// A1 = unq(username-value) ":" unq(realm-value) ":" passwd

-				$A1 = $username. ':' . (isset($digestRequest['realm']) ? $digestRequest['realm'] : '') . ':' . $password;

-

-				// H(A1) = MD5(A1)

-				$HA1 = md5($A1);

-

-				// A2 = Method ":" digest-uri-value

-				$A2 = $this->request_method . ':' . $this->digest_uri;

-

-				// H(A2)

-				$HA2 =  md5($A2);

-

-				// KD(secret, data) = H(concat(secret, ":", data))

-				// if qop == auth:

-				// request-digest  = <"> < KD ( H(A1),     unq(nonce-value)

-				//                              ":" nc-value

-				//                              ":" unq(cnonce-value)

-				//                              ":" unq(qop-value)

-				//                              ":" H(A2)

-				//                            ) <">

-				// if qop is missing,

-				// request-digest  = <"> < KD ( H(A1), unq(nonce-value) ":" H(A2) ) > <">

-

-				$unhashedDigest = '';

-				$nonce = isset($digestRequest['nonce']) ? $digestRequest['nonce'] : '';

-				$cnonce = $nonce;

-				if ($digestRequest['qop'] != '') {

-					$unhashedDigest = $HA1 . ':' . $nonce . ':' . sprintf("%08d", $digestRequest['nc']) . ':' . $cnonce . ':' . $digestRequest['qop'] . ':' . $HA2;

-				} else {

-					$unhashedDigest = $HA1 . ':' . $nonce . ':' . $HA2;

-				}

-

-				$hashedDigest = md5($unhashedDigest);

-

-				$opaque = '';

-				if (isset($digestRequest['opaque'])) {

-					$opaque = ', opaque="' . $digestRequest['opaque'] . '"';

-				}

-

-				$this->setHeader('Authorization', 'Digest username="' . $username . '", realm="' . $digestRequest['realm'] . '", nonce="' . $nonce . '", uri="' . $this->digest_uri . $opaque . '", cnonce="' . $cnonce . '", nc=' . sprintf("%08x", $digestRequest['nc']) . ', qop="' . $digestRequest['qop'] . '", response="' . $hashedDigest . '"');

-			}

-		} elseif ($authtype == 'certificate') {

-			$this->certRequest = $certRequest;

-			$this->debug('Authorization header not set for certificate');

-		} elseif ($authtype == 'ntlm') {

-			// do nothing

-			$this->debug('Authorization header not set for ntlm');

-		}

-		$this->username = $username;

-		$this->password = $password;

-		$this->authtype = $authtype;

-		$this->digestRequest = $digestRequest;

-	}

-

-	/**

-	* set the soapaction value

-	*

-	* @param    string $soapaction

-	* @access   public

-	*/

-	function setSOAPAction($soapaction) {

-		$this->setHeader('SOAPAction', '"' . $soapaction . '"');

-	}

-

-	/**

-	* use http encoding

-	*

-	* @param    string $enc encoding style. supported values: gzip, deflate, or both

-	* @access   public

-	*/

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

-		if (function_exists('gzdeflate')) {

-			$this->protocol_version = '1.1';

-			$this->setHeader('Accept-Encoding', $enc);

-			if (!isset($this->outgoing_headers['Connection'])) {

-				$this->setHeader('Connection', 'close');

-				$this->persistentConnection = false;

-			}

-			// deprecated as of PHP 5.3.0

-			//set_magic_quotes_runtime(0);

-			$this->encoding = $enc;

-		}

-	}

-

-	/**

-	* set proxy info here

-	*

-	* @param    string $proxyhost use an empty string to remove proxy

-	* @param    string $proxyport

-	* @param	string $proxyusername

-	* @param	string $proxypassword

-	* @param	string $proxyauthtype (basic|ntlm)

-	* @access   public

-	*/

-	function setProxy($proxyhost, $proxyport, $proxyusername = '', $proxypassword = '', $proxyauthtype = 'basic') {

-		if ($proxyhost) {

-			$this->proxy = array(

-				'host' => $proxyhost,

-				'port' => $proxyport,

-				'username' => $proxyusername,

-				'password' => $proxypassword,

-				'authtype' => $proxyauthtype

-			);

-			if ($proxyusername != '' && $proxypassword != '' && $proxyauthtype = 'basic') {

-				$this->setHeader('Proxy-Authorization', ' Basic '.base64_encode($proxyusername.':'.$proxypassword));

-			}

-		} else {

-			$this->debug('remove proxy');

-			$proxy = null;

-			unsetHeader('Proxy-Authorization');

-		}

-	}

-

-

-	/**

-	 * Test if the given string starts with a header that is to be skipped.

-	 * Skippable headers result from chunked transfer and proxy requests.

-	 *

-	 * @param	string $data The string to check.

-	 * @returns	boolean	Whether a skippable header was found.

-	 * @access	private

-	 */

-	function isSkippableCurlHeader(&$data) {

-		$skipHeaders = array(	'HTTP/1.1 100',

-								'HTTP/1.0 301',

-								'HTTP/1.1 301',

-								'HTTP/1.0 302',

-								'HTTP/1.1 302',

-								'HTTP/1.0 401',

-								'HTTP/1.1 401',

-								'HTTP/1.0 200 Connection established');

-		foreach ($skipHeaders as $hd) {

-			$prefix = substr($data, 0, strlen($hd));

-			if ($prefix == $hd) return true;

-		}

-

-		return false;

-	}

-

-	/**

-	* decode a string that is encoded w/ "chunked' transfer encoding

- 	* as defined in RFC2068 19.4.6

-	*

-	* @param    string $buffer

-	* @param    string $lb

-	* @returns	string

-	* @access   public

-	* @deprecated

-	*/

-	function decodeChunked($buffer, $lb){

-		// length := 0

-		$length = 0;

-		$new = '';

-

-		// read chunk-size, chunk-extension (if any) and CRLF

-		// get the position of the linebreak

-		$chunkend = strpos($buffer, $lb);

-		if ($chunkend == FALSE) {

-			$this->debug('no linebreak found in decodeChunked');

-			return $new;

-		}

-		$temp = substr($buffer,0,$chunkend);

-		$chunk_size = hexdec( trim($temp) );

-		$chunkstart = $chunkend + strlen($lb);

-		// while (chunk-size > 0) {

-		while ($chunk_size > 0) {

-			$this->debug("chunkstart: $chunkstart chunk_size: $chunk_size");

-			$chunkend = strpos( $buffer, $lb, $chunkstart + $chunk_size);

-

-			// Just in case we got a broken connection

-		  	if ($chunkend == FALSE) {

-		  	    $chunk = substr($buffer,$chunkstart);

-				// append chunk-data to entity-body

-		    	$new .= $chunk;

-		  	    $length += strlen($chunk);

-		  	    break;

-			}

-

-		  	// read chunk-data and CRLF

-		  	$chunk = substr($buffer,$chunkstart,$chunkend-$chunkstart);

-		  	// append chunk-data to entity-body

-		  	$new .= $chunk;

-		  	// length := length + chunk-size

-		  	$length += strlen($chunk);

-		  	// read chunk-size and CRLF

-		  	$chunkstart = $chunkend + strlen($lb);

-

-		  	$chunkend = strpos($buffer, $lb, $chunkstart) + strlen($lb);

-			if ($chunkend == FALSE) {

-				break; //Just in case we got a broken connection

-			}

-			$temp = substr($buffer,$chunkstart,$chunkend-$chunkstart);

-			$chunk_size = hexdec( trim($temp) );

-			$chunkstart = $chunkend;

-		}

-		return $new;

-	}

-

-	/**

-	 * Writes the payload, including HTTP headers, to $this->outgoing_payload.

-	 *

-	 * @param	string $data HTTP body

-	 * @param	string $cookie_str data for HTTP Cookie header

-	 * @return	void

-	 * @access	private

-	 */

-	function buildPayload($data, $cookie_str = '') {

-		// Note: for cURL connections, $this->outgoing_payload is ignored,

-		// as is the Content-Length header, but these are still created as

-		// debugging guides.

-

-		// add content-length header

-		if ($this->request_method != 'GET') {

-			$this->setHeader('Content-Length', strlen($data));

-		}

-

-		// start building outgoing payload:

-		if ($this->proxy) {

-			$uri = $this->url;

-		} else {

-			$uri = $this->uri;

-		}

-		$req = "$this->request_method $uri HTTP/$this->protocol_version";

-		$this->debug("HTTP request: $req");

-		$this->outgoing_payload = "$req\r\n";

-

-		// loop thru headers, serializing

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

-			$hdr = $k.': '.$v;

-			$this->debug("HTTP header: $hdr");

-			$this->outgoing_payload .= "$hdr\r\n";

-		}

-

-		// add any cookies

-		if ($cookie_str != '') {

-			$hdr = 'Cookie: '.$cookie_str;

-			$this->debug("HTTP header: $hdr");

-			$this->outgoing_payload .= "$hdr\r\n";

-		}

-

-		// header/body separator

-		$this->outgoing_payload .= "\r\n";

-

-		// add data

-		$this->outgoing_payload .= $data;

-	}

-

-	/**

-	* sends the SOAP request via HTTP[S]

-	*

-	* @param    string $data message data

-	* @param	array $cookies cookies to send

-	* @return	boolean	true if OK, false if problem

-	* @access   private

-	*/

-	function sendRequest($data, $cookies = NULL) {

-		// build cookie string

-		$cookie_str = $this->getCookiesForRequest($cookies, (($this->scheme == 'ssl') || ($this->scheme == 'https')));

-

-		// build payload

-		$this->buildPayload($data, $cookie_str);

-

-	  if ($this->io_method() == 'socket') {

-		// send payload

-		if(!fputs($this->fp, $this->outgoing_payload, strlen($this->outgoing_payload))) {

-			$this->setError('couldn\'t write message data to socket');

-			$this->debug('couldn\'t write message data to socket');

-			return false;

-		}

-		$this->debug('wrote data to socket, length = ' . strlen($this->outgoing_payload));

-		return true;

-	  } else if ($this->io_method() == 'curl') {

-		// set payload

-		// cURL does say this should only be the verb, and in fact it

-		// turns out that the URI and HTTP version are appended to this, which

-		// some servers refuse to work with (so we no longer use this method!)

-		//$this->setCurlOption(CURLOPT_CUSTOMREQUEST, $this->outgoing_payload);

-		$curl_headers = array();

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

-			if ($k == 'Connection' || $k == 'Content-Length' || $k == 'Host' || $k == 'Authorization' || $k == 'Proxy-Authorization') {

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

-			} else {

-				$curl_headers[] = "$k: $v";

-			}

-		}

-		if ($cookie_str != '') {

-			$curl_headers[] = 'Cookie: ' . $cookie_str;

-		}

-		$this->setCurlOption(CURLOPT_HTTPHEADER, $curl_headers);

-		$this->debug('set cURL HTTP headers');

-		if ($this->request_method == "POST") {

-	  		$this->setCurlOption(CURLOPT_POST, 1);

-	  		$this->setCurlOption(CURLOPT_POSTFIELDS, $data);

-			$this->debug('set cURL POST data');

-	  	} else {

-	  	}

-		// insert custom user-set cURL options

-		foreach ($this->ch_options as $key => $val) {

-			$this->setCurlOption($key, $val);

-		}

-

-		$this->debug('set cURL payload');

-		return true;

-	  }

-	}

-

-	/**

-	* gets the SOAP response via HTTP[S]

-	*

-	* @return	string the response (also sets member variables like incoming_payload)

-	* @access   private

-	*/

-	function getResponse(){

-		$this->incoming_payload = '';

-

-	  if ($this->io_method() == 'socket') {

-	    // loop until headers have been retrieved

-	    $data = '';

-	    while (!isset($lb)){

-

-			// We might EOF during header read.

-			if(feof($this->fp)) {

-				$this->incoming_payload = $data;

-				$this->debug('found no headers before EOF after length ' . strlen($data));

-				$this->debug("received before EOF:\n" . $data);

-				$this->setError('server failed to send headers');

-				return false;

-			}

-

-			$tmp = fgets($this->fp, 256);

-			$tmplen = strlen($tmp);

-			$this->debug("read line of $tmplen bytes: " . trim($tmp));

-

-			if ($tmplen == 0) {

-				$this->incoming_payload = $data;

-				$this->debug('socket read of headers timed out after length ' . strlen($data));

-				$this->debug("read before timeout: " . $data);

-				$this->setError('socket read of headers timed out');

-				return false;

-			}

-

-			$data .= $tmp;

-			$pos = strpos($data,"\r\n\r\n");

-			if($pos > 1){

-				$lb = "\r\n";

-			} else {

-				$pos = strpos($data,"\n\n");

-				if($pos > 1){

-					$lb = "\n";

-				}

-			}

-			// remove 100 headers

-			if (isset($lb) && preg_match('/^HTTP\/1.1 100/',$data)) {

-				unset($lb);

-				$data = '';

-			}//

-		}

-		// store header data

-		$this->incoming_payload .= $data;

-		$this->debug('found end of headers after length ' . strlen($data));

-		// process headers

-		$header_data = trim(substr($data,0,$pos));

-		$header_array = explode($lb,$header_data);

-		$this->incoming_headers = array();

-		$this->incoming_cookies = array();

-		foreach($header_array as $header_line){

-			$arr = explode(':',$header_line, 2);

-			if(count($arr) > 1){

-				$header_name = strtolower(trim($arr[0]));

-				$this->incoming_headers[$header_name] = trim($arr[1]);

-				if ($header_name == 'set-cookie') {

-					// TODO: allow multiple cookies from parseCookie

-					$cookie = $this->parseCookie(trim($arr[1]));

-					if ($cookie) {

-						$this->incoming_cookies[] = $cookie;

-						$this->debug('found cookie: ' . $cookie['name'] . ' = ' . $cookie['value']);

-					} else {

-						$this->debug('did not find cookie in ' . trim($arr[1]));

-					}

-    			}

-			} else if (isset($header_name)) {

-				// append continuation line to previous header

-				$this->incoming_headers[$header_name] .= $lb . ' ' . $header_line;

-			}

-		}

-

-		// loop until msg has been received

-		if (isset($this->incoming_headers['transfer-encoding']) && strtolower($this->incoming_headers['transfer-encoding']) == 'chunked') {

-			$content_length =  2147483647;	// ignore any content-length header

-			$chunked = true;

-			$this->debug("want to read chunked content");

-		} elseif (isset($this->incoming_headers['content-length'])) {

-			$content_length = $this->incoming_headers['content-length'];

-			$chunked = false;

-			$this->debug("want to read content of length $content_length");

-		} else {

-			$content_length =  2147483647;

-			$chunked = false;

-			$this->debug("want to read content to EOF");

-		}

-		$data = '';

-		do {

-			if ($chunked) {

-				$tmp = fgets($this->fp, 256);

-				$tmplen = strlen($tmp);

-				$this->debug("read chunk line of $tmplen bytes");

-				if ($tmplen == 0) {

-					$this->incoming_payload = $data;

-					$this->debug('socket read of chunk length timed out after length ' . strlen($data));

-					$this->debug("read before timeout:\n" . $data);

-					$this->setError('socket read of chunk length timed out');

-					return false;

-				}

-				$content_length = hexdec(trim($tmp));

-				$this->debug("chunk length $content_length");

-			}

-			$strlen = 0;

-		    while (($strlen < $content_length) && (!feof($this->fp))) {

-		    	$readlen = min(8192, $content_length - $strlen);

-				$tmp = fread($this->fp, $readlen);

-				$tmplen = strlen($tmp);

-				$this->debug("read buffer of $tmplen bytes");

-				if (($tmplen == 0) && (!feof($this->fp))) {

-					$this->incoming_payload = $data;

-					$this->debug('socket read of body timed out after length ' . strlen($data));

-					$this->debug("read before timeout:\n" . $data);

-					$this->setError('socket read of body timed out');

-					return false;

-				}

-				$strlen += $tmplen;

-				$data .= $tmp;

-			}

-			if ($chunked && ($content_length > 0)) {

-				$tmp = fgets($this->fp, 256);

-				$tmplen = strlen($tmp);

-				$this->debug("read chunk terminator of $tmplen bytes");

-				if ($tmplen == 0) {

-					$this->incoming_payload = $data;

-					$this->debug('socket read of chunk terminator timed out after length ' . strlen($data));

-					$this->debug("read before timeout:\n" . $data);

-					$this->setError('socket read of chunk terminator timed out');

-					return false;

-				}

-			}

-		} while ($chunked && ($content_length > 0) && (!feof($this->fp)));

-		if (feof($this->fp)) {

-			$this->debug('read to EOF');

-		}

-		$this->debug('read body of length ' . strlen($data));

-		$this->incoming_payload .= $data;

-		$this->debug('received a total of '.strlen($this->incoming_payload).' bytes of data from server');

-

-		// close filepointer

-		if(

-			(isset($this->incoming_headers['connection']) && strtolower($this->incoming_headers['connection']) == 'close') ||

-			(! $this->persistentConnection) || feof($this->fp)){

-			fclose($this->fp);

-			$this->fp = false;

-			$this->debug('closed socket');

-		}

-

-		// connection was closed unexpectedly

-		if($this->incoming_payload == ''){

-			$this->setError('no response from server');

-			return false;

-		}

-

-		// decode transfer-encoding

+        // persistent connection

+        if ($this->persistentConnection) {

+            // I believe the following comment is now bogus, having applied to

+            // the code when it used CURLOPT_CUSTOMREQUEST to send the request.

+            // The way we send data, we cannot use persistent connections, since

+            // there will be some "junk" at the end of our request.

+            //$this->setCurlOption(CURL_HTTP_VERSION_1_1, true);

+            $this->persistentConnection = false;

+            $this->setHeader('Connection', 'close');

+        }

+        // set timeouts

+        if ($connection_timeout != 0) {

+            $this->setCurlOption($CURLOPT_CONNECTIONTIMEOUT, $connection_timeout);

+        }

+        if ($response_timeout != 0) {

+            $this->setCurlOption(CURLOPT_TIMEOUT, $response_timeout);

+        }

+

+        if ($this->scheme == 'https') {

+            $this->debug('set cURL SSL verify options');

+            // recent versions of cURL turn on peer/host checking by default,

+            // while PHP binaries are not compiled with a default location for the

+            // CA cert bundle, so disable peer/host checking.

+            //$this->setCurlOption(CURLOPT_CAINFO, 'f:\php-4.3.2-win32\extensions\curl-ca-bundle.crt');

+            $this->setCurlOption(CURLOPT_SSL_VERIFYPEER, 0);

+            $this->setCurlOption(CURLOPT_SSL_VERIFYHOST, 0);

+

+            // support client certificates (thanks Tobias Boes, Doug Anarino, Eryan Ariobowo)

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

+                $this->debug('set cURL certificate options');

+                if (isset($this->certRequest['cainfofile'])) {

+                    $this->setCurlOption(CURLOPT_CAINFO, $this->certRequest['cainfofile']);

+                }

+                if (isset($this->certRequest['verifypeer'])) {

+                    $this->setCurlOption(CURLOPT_SSL_VERIFYPEER, $this->certRequest['verifypeer']);

+                } else {

+                    $this->setCurlOption(CURLOPT_SSL_VERIFYPEER, 1);

+                }

+                if (isset($this->certRequest['verifyhost'])) {

+                    $this->setCurlOption(CURLOPT_SSL_VERIFYHOST, $this->certRequest['verifyhost']);

+                } else {

+                    $this->setCurlOption(CURLOPT_SSL_VERIFYHOST, 1);

+                }

+                if (isset($this->certRequest['sslcertfile'])) {

+                    $this->setCurlOption(CURLOPT_SSLCERT, $this->certRequest['sslcertfile']);

+                }

+                if (isset($this->certRequest['sslkeyfile'])) {

+                    $this->setCurlOption(CURLOPT_SSLKEY, $this->certRequest['sslkeyfile']);

+                }

+                if (isset($this->certRequest['passphrase'])) {

+                    $this->setCurlOption(CURLOPT_SSLKEYPASSWD, $this->certRequest['passphrase']);

+                }

+                if (isset($this->certRequest['certpassword'])) {

+                    $this->setCurlOption(CURLOPT_SSLCERTPASSWD, $this->certRequest['certpassword']);

+                }

+            }

+        }

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

+            if ($this->username) {

+                $this->debug('set cURL username/password');

+                $this->setCurlOption(CURLOPT_USERPWD, "$this->username:$this->password");

+            }

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

+                $this->debug('set cURL for Basic authentication');

+                $this->setCurlOption($CURLOPT_HTTPAUTH, $CURLAUTH_BASIC);

+            }

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

+                $this->debug('set cURL for digest authentication');

+                $this->setCurlOption($CURLOPT_HTTPAUTH, $CURLAUTH_DIGEST);

+            }

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

+                $this->debug('set cURL for NTLM authentication');

+                $this->setCurlOption($CURLOPT_HTTPAUTH, $CURLAUTH_NTLM);

+            }

+        }

+        if (is_array($this->proxy)) {

+            $this->debug('set cURL proxy options');

+            if ($this->proxy['port'] != '') {

+                $this->setCurlOption(CURLOPT_PROXY, $this->proxy['host'].':'.$this->proxy['port']);

+            } else {

+                $this->setCurlOption(CURLOPT_PROXY, $this->proxy['host']);

+            }

+            if ($this->proxy['username'] || $this->proxy['password']) {

+                $this->debug('set cURL proxy authentication options');

+                $this->setCurlOption(CURLOPT_PROXYUSERPWD, $this->proxy['username'].':'.$this->proxy['password']);

+                if ($this->proxy['authtype'] == 'basic') {

+                    $this->setCurlOption($CURLOPT_PROXYAUTH, $CURLAUTH_BASIC);

+                }

+                if ($this->proxy['authtype'] == 'ntlm') {

+                    $this->setCurlOption($CURLOPT_PROXYAUTH, $CURLAUTH_NTLM);

+                }

+            }

+        }

+        $this->debug('cURL connection set up');

+        return true;

+        } else {

+        $this->setError('Unknown scheme ' . $this->scheme);

+        $this->debug('Unknown scheme ' . $this->scheme);

+        return false;

+        }

+    }

+

+    /**

+     * sends the SOAP request and gets the SOAP response via HTTP[S]

+     *

+     * @param    string $data message data

+     * @param    integer $timeout set connection timeout in seconds

+     * @param	integer $response_timeout set response timeout in seconds

+     * @param	array $cookies cookies to send

+     * @return	string data

+     * @access   public

+     */

+    function send($data, $timeout=0, $response_timeout=30, $cookies=NULL) {

+

+        $this->debug('entered send() with data of length: '.strlen($data));

+

+        $this->tryagain = true;

+        $tries = 0;

+        while ($this->tryagain) {

+            $this->tryagain = false;

+            if ($tries++ < 2) {

+                // make connnection

+                if (!$this->connect($timeout, $response_timeout)){

+                    return false;

+                }

+

+                // send request

+                if (!$this->sendRequest($data, $cookies)){

+                    return false;

+                }

+

+                // get response

+                $respdata = $this->getResponse();

+            } else {

+                $this->setError("Too many tries to get an OK response ($this->response_status_line)");

+            }

+        }

+        $this->debug('end of send()');

+        return $respdata;

+    }

+

+

+    /**

+     * sends the SOAP request and gets the SOAP response via HTTPS using CURL

+     *

+     * @param    string $data message data

+     * @param    integer $timeout set connection timeout in seconds

+     * @param	integer $response_timeout set response timeout in seconds

+     * @param	array $cookies cookies to send

+     * @return	string data

+     * @access   public

+     * @deprecated

+     */

+    function sendHTTPS($data, $timeout=0, $response_timeout=30, $cookies) {

+        return $this->send($data, $timeout, $response_timeout, $cookies);

+    }

+

+    /**

+     * if authenticating, set user credentials here

+     *

+     * @param    string $username

+     * @param    string $password

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

+     * @param	array $digestRequest (keys must be nonce, nc, realm, qop)

+     * @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', $digestRequest = array(), $certRequest = array()) {

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

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

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

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

+        // cf. RFC 2617

+        if ($authtype == 'basic') {

+            $this->setHeader('Authorization', 'Basic '.base64_encode(str_replace(':','',$username).':'.$password));

+        } elseif ($authtype == 'digest') {

+            if (isset($digestRequest['nonce'])) {

+                $digestRequest['nc'] = isset($digestRequest['nc']) ? $digestRequest['nc']++ : 1;

+

+                // calculate the Digest hashes (calculate code based on digest implementation found at: http://www.rassoc.com/gregr/weblog/stories/2002/07/09/webServicesSecurityHttpDigestAuthenticationWithoutActiveDirectory.html)

+

+                // A1 = unq(username-value) ":" unq(realm-value) ":" passwd

+                $A1 = $username. ':' . (isset($digestRequest['realm']) ? $digestRequest['realm'] : '') . ':' . $password;

+

+                // H(A1) = MD5(A1)

+                $HA1 = md5($A1);

+

+                // A2 = Method ":" digest-uri-value

+                $A2 = $this->request_method . ':' . $this->digest_uri;

+

+                // H(A2)

+                $HA2 =  md5($A2);

+

+                // KD(secret, data) = H(concat(secret, ":", data))

+                // if qop == auth:

+                // request-digest  = <"> < KD ( H(A1),     unq(nonce-value)

+                //                              ":" nc-value

+                //                              ":" unq(cnonce-value)

+                //                              ":" unq(qop-value)

+                //                              ":" H(A2)

+                //                            ) <">

+                // if qop is missing,

+                // request-digest  = <"> < KD ( H(A1), unq(nonce-value) ":" H(A2) ) > <">

+

+                $unhashedDigest = '';

+                $nonce = isset($digestRequest['nonce']) ? $digestRequest['nonce'] : '';

+                $cnonce = $nonce;

+                if ($digestRequest['qop'] != '') {

+                    $unhashedDigest = $HA1 . ':' . $nonce . ':' . sprintf("%08d", $digestRequest['nc']) . ':' . $cnonce . ':' . $digestRequest['qop'] . ':' . $HA2;

+                } else {

+                    $unhashedDigest = $HA1 . ':' . $nonce . ':' . $HA2;

+                }

+

+                $hashedDigest = md5($unhashedDigest);

+

+                $opaque = '';

+                if (isset($digestRequest['opaque'])) {

+                    $opaque = ', opaque="' . $digestRequest['opaque'] . '"';

+                }

+

+                $this->setHeader('Authorization', 'Digest username="' . $username . '", realm="' . $digestRequest['realm'] . '", nonce="' . $nonce . '", uri="' . $this->digest_uri . $opaque . '", cnonce="' . $cnonce . '", nc=' . sprintf("%08x", $digestRequest['nc']) . ', qop="' . $digestRequest['qop'] . '", response="' . $hashedDigest . '"');

+            }

+        } elseif ($authtype == 'certificate') {

+            $this->certRequest = $certRequest;

+            $this->debug('Authorization header not set for certificate');

+        } elseif ($authtype == 'ntlm') {

+            // do nothing

+            $this->debug('Authorization header not set for ntlm');

+        }

+        $this->username = $username;

+        $this->password = $password;

+        $this->authtype = $authtype;

+        $this->digestRequest = $digestRequest;

+    }

+

+    /**

+     * set the soapaction value

+     *

+     * @param    string $soapaction

+     * @access   public

+     */

+    function setSOAPAction($soapaction) {

+        $this->setHeader('SOAPAction', '"' . $soapaction . '"');

+    }

+

+    /**

+     * use http encoding

+     *

+     * @param    string $enc encoding style. supported values: gzip, deflate, or both

+     * @access   public

+     */

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

+        if (function_exists('gzdeflate')) {

+            $this->protocol_version = '1.1';

+            $this->setHeader('Accept-Encoding', $enc);

+            if (!isset($this->outgoing_headers['Connection'])) {

+                $this->setHeader('Connection', 'close');

+                $this->persistentConnection = false;

+            }

+            // deprecated as of PHP 5.3.0

+            //set_magic_quotes_runtime(0);

+            $this->encoding = $enc;

+        }

+    }

+

+    /**

+     * set proxy info here

+     *

+     * @param    string $proxyhost use an empty string to remove proxy

+     * @param    string $proxyport

+     * @param	string $proxyusername

+     * @param	string $proxypassword

+     * @param	string $proxyauthtype (basic|ntlm)

+     * @access   public

+     */

+    function setProxy($proxyhost, $proxyport, $proxyusername = '', $proxypassword = '', $proxyauthtype = 'basic') {

+        if ($proxyhost) {

+            $this->proxy = array(

+                'host' => $proxyhost,

+                'port' => $proxyport,

+                'username' => $proxyusername,

+                'password' => $proxypassword,

+                'authtype' => $proxyauthtype

+            );

+            if ($proxyusername != '' && $proxypassword != '' && $proxyauthtype = 'basic') {

+                $this->setHeader('Proxy-Authorization', ' Basic '.base64_encode($proxyusername.':'.$proxypassword));

+            }

+        } else {

+            $this->debug('remove proxy');

+            $proxy = null;

+            unsetHeader('Proxy-Authorization');

+        }

+    }

+

+

+    /**

+     * Test if the given string starts with a header that is to be skipped.

+     * Skippable headers result from chunked transfer and proxy requests.

+     *

+     * @param	string $data The string to check.

+     * @returns	boolean	Whether a skippable header was found.

+     * @access	private

+     */

+    function isSkippableCurlHeader(&$data) {

+        $skipHeaders = array(	'HTTP/1.1 100',

+                                'HTTP/1.0 301',

+                                'HTTP/1.1 301',

+                                'HTTP/1.0 302',

+                                'HTTP/1.1 302',

+                                'HTTP/1.0 401',

+                                'HTTP/1.1 401',

+                                'HTTP/1.0 200 Connection established');

+        foreach ($skipHeaders as $hd) {

+            $prefix = substr($data, 0, strlen($hd));

+            if ($prefix == $hd) return true;

+        }

+

+        return false;

+    }

+

+    /**

+     * decode a string that is encoded w/ "chunked' transfer encoding

+     * as defined in RFC2068 19.4.6

+     *

+     * @param    string $buffer

+     * @param    string $lb

+     * @returns	string

+     * @access   public

+     * @deprecated

+     */

+    function decodeChunked($buffer, $lb){

+        // length := 0

+        $length = 0;

+        $new = '';

+

+        // read chunk-size, chunk-extension (if any) and CRLF

+        // get the position of the linebreak

+        $chunkend = strpos($buffer, $lb);

+        if ($chunkend == FALSE) {

+            $this->debug('no linebreak found in decodeChunked');

+            return $new;

+        }

+        $temp = substr($buffer,0,$chunkend);

+        $chunk_size = hexdec( trim($temp) );

+        $chunkstart = $chunkend + strlen($lb);

+        // while (chunk-size > 0) {

+        while ($chunk_size > 0) {

+            $this->debug("chunkstart: $chunkstart chunk_size: $chunk_size");

+            $chunkend = strpos( $buffer, $lb, $chunkstart + $chunk_size);

+

+            // Just in case we got a broken connection

+                if ($chunkend == FALSE) {

+                    $chunk = substr($buffer,$chunkstart);

+                // append chunk-data to entity-body

+                $new .= $chunk;

+                    $length += strlen($chunk);

+                    break;

+            }

+

+                // read chunk-data and CRLF

+                $chunk = substr($buffer,$chunkstart,$chunkend-$chunkstart);

+                // append chunk-data to entity-body

+                $new .= $chunk;

+                // length := length + chunk-size

+                $length += strlen($chunk);

+                // read chunk-size and CRLF

+                $chunkstart = $chunkend + strlen($lb);

+

+                $chunkend = strpos($buffer, $lb, $chunkstart) + strlen($lb);

+            if ($chunkend == FALSE) {

+                break; //Just in case we got a broken connection

+            }

+            $temp = substr($buffer,$chunkstart,$chunkend-$chunkstart);

+            $chunk_size = hexdec( trim($temp) );

+            $chunkstart = $chunkend;

+        }

+        return $new;

+    }

+

+    /**

+     * Writes the payload, including HTTP headers, to $this->outgoing_payload.

+     *

+     * @param	string $data HTTP body

+     * @param	string $cookie_str data for HTTP Cookie header

+     * @return	void

+     * @access	private

+     */

+    function buildPayload($data, $cookie_str = '') {

+        // Note: for cURL connections, $this->outgoing_payload is ignored,

+        // as is the Content-Length header, but these are still created as

+        // debugging guides.

+

+        // add content-length header

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

+            $this->setHeader('Content-Length', strlen($data));

+        }

+

+        // start building outgoing payload:

+        if ($this->proxy) {

+            $uri = $this->url;

+        } else {

+            $uri = $this->uri;

+        }

+        $req = "$this->request_method $uri HTTP/$this->protocol_version";

+        $this->debug("HTTP request: $req");

+        $this->outgoing_payload = "$req\r\n";

+

+        // loop thru headers, serializing

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

+            $hdr = $k.': '.$v;

+            $this->debug("HTTP header: $hdr");

+            $this->outgoing_payload .= "$hdr\r\n";

+        }

+

+        // add any cookies

+        if ($cookie_str != '') {

+            $hdr = 'Cookie: '.$cookie_str;

+            $this->debug("HTTP header: $hdr");

+            $this->outgoing_payload .= "$hdr\r\n";

+        }

+

+        // header/body separator

+        $this->outgoing_payload .= "\r\n";

+

+        // add data

+        $this->outgoing_payload .= $data;

+    }

+

+    /**

+     * sends the SOAP request via HTTP[S]

+     *

+     * @param    string $data message data

+     * @param	array $cookies cookies to send

+     * @return	boolean	true if OK, false if problem

+     * @access   private

+     */

+    function sendRequest($data, $cookies = NULL) {

+        // build cookie string

+        $cookie_str = $this->getCookiesForRequest($cookies, (($this->scheme == 'ssl') || ($this->scheme == 'https')));

+

+        // build payload

+        $this->buildPayload($data, $cookie_str);

+

+        if ($this->io_method() == 'socket') {

+        // send payload

+        if(!fputs($this->fp, $this->outgoing_payload, strlen($this->outgoing_payload))) {

+            $this->setError('couldn\'t write message data to socket');

+            $this->debug('couldn\'t write message data to socket');

+            return false;

+        }

+        $this->debug('wrote data to socket, length = ' . strlen($this->outgoing_payload));

+        return true;

+        } else if ($this->io_method() == 'curl') {

+        // set payload

+        // cURL does say this should only be the verb, and in fact it

+        // turns out that the URI and HTTP version are appended to this, which

+        // some servers refuse to work with (so we no longer use this method!)

+        //$this->setCurlOption(CURLOPT_CUSTOMREQUEST, $this->outgoing_payload);

+        $curl_headers = array();

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

+            if ($k == 'Connection' || $k == 'Content-Length' || $k == 'Host' || $k == 'Authorization' || $k == 'Proxy-Authorization') {

+                $this->debug("Skip cURL header $k: $v");

+            } else {

+                $curl_headers[] = "$k: $v";

+            }

+        }

+        if ($cookie_str != '') {

+            $curl_headers[] = 'Cookie: ' . $cookie_str;

+        }

+        $this->setCurlOption(CURLOPT_HTTPHEADER, $curl_headers);

+        $this->debug('set cURL HTTP headers');

+        if ($this->request_method == "POST") {

+                $this->setCurlOption(CURLOPT_POST, 1);

+                $this->setCurlOption(CURLOPT_POSTFIELDS, $data);

+            $this->debug('set cURL POST data');

+            } else {

+            }

+        // insert custom user-set cURL options

+        foreach ($this->ch_options as $key => $val) {

+            $this->setCurlOption($key, $val);

+        }

+

+        $this->debug('set cURL payload');

+        return true;

+        }

+    }

+

+    /**

+     * gets the SOAP response via HTTP[S]

+     *

+     * @return	string the response (also sets member variables like incoming_payload)

+     * @access   private

+     */

+    function getResponse(){

+        $this->incoming_payload = '';

+

+        if ($this->io_method() == 'socket') {

+        // loop until headers have been retrieved

+        $data = '';

+        while (!isset($lb)){

+

+            // We might EOF during header read.

+            if(feof($this->fp)) {

+                $this->incoming_payload = $data;

+                $this->debug('found no headers before EOF after length ' . strlen($data));

+                $this->debug("received before EOF:\n" . $data);

+                $this->setError('server failed to send headers');

+                return false;

+            }

+

+            $tmp = fgets($this->fp, 256);

+            $tmplen = strlen($tmp);

+            $this->debug("read line of $tmplen bytes: " . trim($tmp));

+

+            if ($tmplen == 0) {

+                $this->incoming_payload = $data;

+                $this->debug('socket read of headers timed out after length ' . strlen($data));

+                $this->debug("read before timeout: " . $data);

+                $this->setError('socket read of headers timed out');

+                return false;

+            }

+

+            $data .= $tmp;

+            $pos = strpos($data,"\r\n\r\n");

+            if($pos > 1){

+                $lb = "\r\n";

+            } else {

+                $pos = strpos($data,"\n\n");

+                if($pos > 1){

+                    $lb = "\n";

+                }

+            }

+            // remove 100 headers

+            if (isset($lb) && preg_match('/^HTTP\/1.1 100/',$data)) {

+                unset($lb);

+                $data = '';

+            }//

+        }

+        // store header data

+        $this->incoming_payload .= $data;

+        $this->debug('found end of headers after length ' . strlen($data));

+        // process headers

+        $header_data = trim(substr($data,0,$pos));

+        $header_array = explode($lb,$header_data);

+        $this->incoming_headers = array();

+        $this->incoming_cookies = array();

+        foreach($header_array as $header_line){

+            $arr = explode(':',$header_line, 2);

+            if(count($arr) > 1){

+                $header_name = strtolower(trim($arr[0]));

+                $this->incoming_headers[$header_name] = trim($arr[1]);

+                if ($header_name == 'set-cookie') {

+                    // TODO: allow multiple cookies from parseCookie

+                    $cookie = $this->parseCookie(trim($arr[1]));

+                    if ($cookie) {

+                        $this->incoming_cookies[] = $cookie;

+                        $this->debug('found cookie: ' . $cookie['name'] . ' = ' . $cookie['value']);

+                    } else {

+                        $this->debug('did not find cookie in ' . trim($arr[1]));

+                    }

+                }

+            } else if (isset($header_name)) {

+                // append continuation line to previous header

+                $this->incoming_headers[$header_name] .= $lb . ' ' . $header_line;

+            }

+        }

+

+        // loop until msg has been received

+        if (isset($this->incoming_headers['transfer-encoding']) && strtolower($this->incoming_headers['transfer-encoding']) == 'chunked') {

+            $content_length =  2147483647;	// ignore any content-length header

+            $chunked = true;

+            $this->debug("want to read chunked content");

+        } elseif (isset($this->incoming_headers['content-length'])) {

+            $content_length = $this->incoming_headers['content-length'];

+            $chunked = false;

+            $this->debug("want to read content of length $content_length");

+        } else {

+            $content_length =  2147483647;

+            $chunked = false;

+            $this->debug("want to read content to EOF");

+        }

+        $data = '';

+        do {

+            if ($chunked) {

+                $tmp = fgets($this->fp, 256);

+                $tmplen = strlen($tmp);

+                $this->debug("read chunk line of $tmplen bytes");

+                if ($tmplen == 0) {

+                    $this->incoming_payload = $data;

+                    $this->debug('socket read of chunk length timed out after length ' . strlen($data));

+                    $this->debug("read before timeout:\n" . $data);

+                    $this->setError('socket read of chunk length timed out');

+                    return false;

+                }

+                $content_length = hexdec(trim($tmp));

+                $this->debug("chunk length $content_length");

+            }

+            $strlen = 0;

+            while (($strlen < $content_length) && (!feof($this->fp))) {

+                $readlen = min(8192, $content_length - $strlen);

+                $tmp = fread($this->fp, $readlen);

+                $tmplen = strlen($tmp);

+                $this->debug("read buffer of $tmplen bytes");

+                if (($tmplen == 0) && (!feof($this->fp))) {

+                    $this->incoming_payload = $data;

+                    $this->debug('socket read of body timed out after length ' . strlen($data));

+                    $this->debug("read before timeout:\n" . $data);

+                    $this->setError('socket read of body timed out');

+                    return false;

+                }

+                $strlen += $tmplen;

+                $data .= $tmp;

+            }

+            if ($chunked && ($content_length > 0)) {

+                $tmp = fgets($this->fp, 256);

+                $tmplen = strlen($tmp);

+                $this->debug("read chunk terminator of $tmplen bytes");

+                if ($tmplen == 0) {

+                    $this->incoming_payload = $data;

+                    $this->debug('socket read of chunk terminator timed out after length ' . strlen($data));

+                    $this->debug("read before timeout:\n" . $data);

+                    $this->setError('socket read of chunk terminator timed out');

+                    return false;

+                }

+            }

+        } while ($chunked && ($content_length > 0) && (!feof($this->fp)));

+        if (feof($this->fp)) {

+            $this->debug('read to EOF');

+        }

+        $this->debug('read body of length ' . strlen($data));

+        $this->incoming_payload .= $data;

+        $this->debug('received a total of '.strlen($this->incoming_payload).' bytes of data from server');

+

+        // close filepointer

+        if(

+            (isset($this->incoming_headers['connection']) && strtolower($this->incoming_headers['connection']) == 'close') ||

+            (! $this->persistentConnection) || feof($this->fp)){

+            fclose($this->fp);

+            $this->fp = false;

+            $this->debug('closed socket');

+        }

+

+        // connection was closed unexpectedly

+        if($this->incoming_payload == ''){

+            $this->setError('no response from server');

+            return false;

+        }

+

+        // decode transfer-encoding

 //		if(isset($this->incoming_headers['transfer-encoding']) && strtolower($this->incoming_headers['transfer-encoding']) == 'chunked'){

 //			if(!$data = $this->decodeChunked($data, $lb)){

 //				$this->setError('Decoding of chunked data failed');

 //				return false;

 //			}

-			//print "<pre>\nde-chunked:\n---------------\n$data\n\n---------------\n</pre>";

-			// set decoded payload

+            //print "<pre>\nde-chunked:\n---------------\n$data\n\n---------------\n</pre>";

+            // set decoded payload

 //			$this->incoming_payload = $header_data.$lb.$lb.$data;

 //		}

 

-	  } else if ($this->io_method() == 'curl') {

-		// send and receive

-		$this->debug('send and receive with cURL');

-		$this->incoming_payload = curl_exec($this->ch);

-		$data = $this->incoming_payload;

+        } else if ($this->io_method() == 'curl') {

+        // send and receive

+        $this->debug('send and receive with cURL');

+        $this->incoming_payload = curl_exec($this->ch);

+        $data = $this->incoming_payload;

 

         $cErr = curl_error($this->ch);

-		if ($cErr != '') {

-        	$err = 'cURL ERROR: '.curl_errno($this->ch).': '.$cErr.'<br>';

-        	// TODO: there is a PHP bug that can cause this to SEGV for CURLINFO_CONTENT_TYPE

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

-				$err .= "$k: $v<br>";

-			}

-			$this->debug($err);

-			$this->setError($err);

-			curl_close($this->ch);

-	    	return false;

-		} else {

-			//echo '<pre>';

-			//var_dump(curl_getinfo($this->ch));

-			//echo '</pre>';

-		}

-		// close curl

-		$this->debug('No cURL error, closing cURL');

-		curl_close($this->ch);

-

-		// try removing skippable headers

-		$savedata = $data;

-		while ($this->isSkippableCurlHeader($data)) {

-			$this->debug("Found HTTP header to skip");

-			if ($pos = strpos($data,"\r\n\r\n")) {

-				$data = ltrim(substr($data,$pos));

-			} elseif($pos = strpos($data,"\n\n") ) {

-				$data = ltrim(substr($data,$pos));

-			}

-		}

-

-		if ($data == '') {

-			// have nothing left; just remove 100 header(s)

-			$data = $savedata;

-			while (preg_match('/^HTTP\/1.1 100/',$data)) {

-				if ($pos = strpos($data,"\r\n\r\n")) {

-					$data = ltrim(substr($data,$pos));

-				} elseif($pos = strpos($data,"\n\n") ) {

-					$data = ltrim(substr($data,$pos));

-				}

-			}

-		}

-

-		// separate content from HTTP headers

-		if ($pos = strpos($data,"\r\n\r\n")) {

-			$lb = "\r\n";

-		} elseif( $pos = strpos($data,"\n\n")) {

-			$lb = "\n";

-		} else {

-			$this->debug('no proper separation of headers and document');

-			$this->setError('no proper separation of headers and document');

-			return false;

-		}

-		$header_data = trim(substr($data,0,$pos));

-		$header_array = explode($lb,$header_data);

-		$data = ltrim(substr($data,$pos));

-		$this->debug('found proper separation of headers and document');

-		$this->debug('cleaned data, stringlen: '.strlen($data));

-		// clean headers

-		foreach ($header_array as $header_line) {

-			$arr = explode(':',$header_line,2);

-			if(count($arr) > 1){

-				$header_name = strtolower(trim($arr[0]));

-				$this->incoming_headers[$header_name] = trim($arr[1]);

-				if ($header_name == 'set-cookie') {

-					// TODO: allow multiple cookies from parseCookie

-					$cookie = $this->parseCookie(trim($arr[1]));

-					if ($cookie) {

-						$this->incoming_cookies[] = $cookie;

-						$this->debug('found cookie: ' . $cookie['name'] . ' = ' . $cookie['value']);

-					} else {

-						$this->debug('did not find cookie in ' . trim($arr[1]));

-					}

-    			}

-			} else if (isset($header_name)) {

-				// append continuation line to previous header

-				$this->incoming_headers[$header_name] .= $lb . ' ' . $header_line;

-			}

-		}

-	  }

-

-		$this->response_status_line = $header_array[0];

-		$arr = explode(' ', $this->response_status_line, 3);

-		$http_version = $arr[0];

-		$http_status = intval($arr[1]);

-		$http_reason = count($arr) > 2 ? $arr[2] : '';

-

- 		// see if we need to resend the request with http digest authentication

- 		if (isset($this->incoming_headers['location']) && ($http_status == 301 || $http_status == 302)) {

- 			$this->debug("Got $http_status $http_reason with Location: " . $this->incoming_headers['location']);

- 			$this->setURL($this->incoming_headers['location']);

-			$this->tryagain = true;

-			return false;

-		}

-

- 		// see if we need to resend the request with http digest authentication

- 		if (isset($this->incoming_headers['www-authenticate']) && $http_status == 401) {

- 			$this->debug("Got 401 $http_reason with WWW-Authenticate: " . $this->incoming_headers['www-authenticate']);

- 			if (strstr($this->incoming_headers['www-authenticate'], "Digest ")) {

- 				$this->debug('Server wants digest authentication');

- 				// remove "Digest " from our elements

- 				$digestString = str_replace('Digest ', '', $this->incoming_headers['www-authenticate']);

-

- 				// parse elements into array

- 				$digestElements = explode(',', $digestString);

- 				foreach ($digestElements as $val) {

- 					$tempElement = explode('=', trim($val), 2);

- 					$digestRequest[$tempElement[0]] = str_replace("\"", '', $tempElement[1]);

- 				}

-

-				// should have (at least) qop, realm, nonce

- 				if (isset($digestRequest['nonce'])) {

- 					$this->setCredentials($this->username, $this->password, 'digest', $digestRequest);

- 					$this->tryagain = true;

- 					return false;

- 				}

- 			}

-			$this->debug('HTTP authentication failed');

-			$this->setError('HTTP authentication failed');

-			return false;

- 		}

-

-		if (

-			($http_status >= 300 && $http_status <= 307) ||

-			($http_status >= 400 && $http_status <= 417) ||

-			($http_status >= 501 && $http_status <= 505)

-		   ) {

-			$this->setError("Unsupported HTTP response status $http_status $http_reason (soapclient->response has contents of the response)");

-			return false;

-		}

-

-		// decode content-encoding

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

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

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

-    			if(function_exists('gzinflate')){

-					//$timer->setMarker('starting decoding of gzip/deflated content');

-					// IIS 5 requires gzinflate instead of gzuncompress (similar to IE 5 and gzdeflate v. gzcompress)

-					// this means there are no Zlib headers, although there should be

-					$this->debug('The gzinflate function exists');

-					$datalen = strlen($data);

-					if ($this->incoming_headers['content-encoding'] == 'deflate') {

-						if ($degzdata = @gzinflate($data)) {

-	    					$data = $degzdata;

-	    					$this->debug('The payload has been inflated to ' . strlen($data) . ' bytes');

-	    					if (strlen($data) < $datalen) {

-	    						// test for the case that the payload has been compressed twice

-		    					$this->debug('The inflated payload is smaller than the gzipped one; try again');

-								if ($degzdata = @gzinflate($data)) {

-			    					$data = $degzdata;

-			    					$this->debug('The payload has been inflated again to ' . strlen($data) . ' bytes');

-								}

-	    					}

-	    				} else {

-	    					$this->debug('Error using gzinflate to inflate the payload');

-	    					$this->setError('Error using gzinflate to inflate the payload');

-	    				}

-					} elseif ($this->incoming_headers['content-encoding'] == 'gzip') {

-						if ($degzdata = @gzinflate(substr($data, 10))) {	// do our best

-							$data = $degzdata;

-	    					$this->debug('The payload has been un-gzipped to ' . strlen($data) . ' bytes');

-	    					if (strlen($data) < $datalen) {

-	    						// test for the case that the payload has been compressed twice

-		    					$this->debug('The un-gzipped payload is smaller than the gzipped one; try again');

-								if ($degzdata = @gzinflate(substr($data, 10))) {

-			    					$data = $degzdata;

-			    					$this->debug('The payload has been un-gzipped again to ' . strlen($data) . ' bytes');

-								}

-	    					}

-	    				} else {

-	    					$this->debug('Error using gzinflate to un-gzip the payload');

-							$this->setError('Error using gzinflate to un-gzip the payload');

-	    				}

-					}

-					//$timer->setMarker('finished decoding of gzip/deflated content');

-					//print "<xmp>\nde-inflated:\n---------------\n$data\n-------------\n</xmp>";

-					// set decoded payload

-					$this->incoming_payload = $header_data.$lb.$lb.$data;

-    			} else {

-					$this->debug('The server sent compressed data. Your php install must have the Zlib extension compiled in to support this.');

-					$this->setError('The server sent compressed data. Your php install must have the Zlib extension compiled in to support this.');

-				}

-			} else {

-				$this->debug('Unsupported Content-Encoding ' . $this->incoming_headers['content-encoding']);

-				$this->setError('Unsupported Content-Encoding ' . $this->incoming_headers['content-encoding']);

-			}

-		} else {

-			$this->debug('No Content-Encoding header');

-		}

-

-		if(strlen($data) == 0){

-			$this->debug('no data after headers!');

-			$this->setError('no data present after HTTP headers');

-			return false;

-		}

-

-		return $data;

-	}

-

-	/**

-	 * sets the content-type for the SOAP message to be sent

-	 *

-	 * @param	string $type the content type, MIME style

-	 * @param	mixed $charset character set used for encoding (or false)

-	 * @access	public

-	 */

-	function setContentType($type, $charset = false) {

-		$this->setHeader('Content-Type', $type . ($charset ? '; charset=' . $charset : ''));

-	}

-

-	/**

-	 * specifies that an HTTP persistent connection should be used

-	 *

-	 * @return	boolean whether the request was honored by this method.

-	 * @access	public

-	 */

-	function usePersistentConnection(){

-		if (isset($this->outgoing_headers['Accept-Encoding'])) {

-			return false;

-		}

-		$this->protocol_version = '1.1';

-		$this->persistentConnection = true;

-		$this->setHeader('Connection', 'Keep-Alive');

-		return true;

-	}

-

-	/**

-	 * parse an incoming Cookie into it's parts

-	 *

-	 * @param	string $cookie_str content of cookie

-	 * @return	array with data of that cookie

-	 * @access	private

-	 */

-	/*

+        if ($cErr != '') {

+            $err = 'cURL ERROR: '.curl_errno($this->ch).': '.$cErr.'<br>';

+            // TODO: there is a PHP bug that can cause this to SEGV for CURLINFO_CONTENT_TYPE

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

+                $err .= "$k: $v<br>";

+            }

+            $this->debug($err);

+            $this->setError($err);

+            curl_close($this->ch);

+            return false;

+        } else {

+            //echo '<pre>';

+            //var_dump(curl_getinfo($this->ch));

+            //echo '</pre>';

+        }

+        // close curl

+        $this->debug('No cURL error, closing cURL');

+        curl_close($this->ch);

+

+        // try removing skippable headers

+        $savedata = $data;

+        while ($this->isSkippableCurlHeader($data)) {

+            $this->debug("Found HTTP header to skip");

+            if ($pos = strpos($data,"\r\n\r\n")) {

+                $data = ltrim(substr($data,$pos));

+            } elseif($pos = strpos($data,"\n\n") ) {

+                $data = ltrim(substr($data,$pos));

+            }

+        }

+

+        if ($data == '') {

+            // have nothing left; just remove 100 header(s)

+            $data = $savedata;

+            while (preg_match('/^HTTP\/1.1 100/',$data)) {

+                if ($pos = strpos($data,"\r\n\r\n")) {

+                    $data = ltrim(substr($data,$pos));

+                } elseif($pos = strpos($data,"\n\n") ) {

+                    $data = ltrim(substr($data,$pos));

+                }

+            }

+        }

+

+        // separate content from HTTP headers

+        if ($pos = strpos($data,"\r\n\r\n")) {

+            $lb = "\r\n";

+        } elseif( $pos = strpos($data,"\n\n")) {

+            $lb = "\n";

+        } else {

+            $this->debug('no proper separation of headers and document');

+            $this->setError('no proper separation of headers and document');

+            return false;

+        }

+        $header_data = trim(substr($data,0,$pos));

+        $header_array = explode($lb,$header_data);

+        $data = ltrim(substr($data,$pos));

+        $this->debug('found proper separation of headers and document');

+        $this->debug('cleaned data, stringlen: '.strlen($data));

+        // clean headers

+        foreach ($header_array as $header_line) {

+            $arr = explode(':',$header_line,2);

+            if(count($arr) > 1){

+                $header_name = strtolower(trim($arr[0]));

+                $this->incoming_headers[$header_name] = trim($arr[1]);

+                if ($header_name == 'set-cookie') {

+                    // TODO: allow multiple cookies from parseCookie

+                    $cookie = $this->parseCookie(trim($arr[1]));

+                    if ($cookie) {

+                        $this->incoming_cookies[] = $cookie;

+                        $this->debug('found cookie: ' . $cookie['name'] . ' = ' . $cookie['value']);

+                    } else {

+                        $this->debug('did not find cookie in ' . trim($arr[1]));

+                    }

+                }

+            } else if (isset($header_name)) {

+                // append continuation line to previous header

+                $this->incoming_headers[$header_name] .= $lb . ' ' . $header_line;

+            }

+        }

+        }

+

+        $this->response_status_line = $header_array[0];

+        $arr = explode(' ', $this->response_status_line, 3);

+        $http_version = $arr[0];

+        $http_status = intval($arr[1]);

+        $http_reason = count($arr) > 2 ? $arr[2] : '';

+

+            // see if we need to resend the request with http digest authentication

+            if (isset($this->incoming_headers['location']) && ($http_status == 301 || $http_status == 302)) {

+                $this->debug("Got $http_status $http_reason with Location: " . $this->incoming_headers['location']);

+                $this->setURL($this->incoming_headers['location']);

+            $this->tryagain = true;

+            return false;

+        }

+

+            // see if we need to resend the request with http digest authentication

+            if (isset($this->incoming_headers['www-authenticate']) && $http_status == 401) {

+                $this->debug("Got 401 $http_reason with WWW-Authenticate: " . $this->incoming_headers['www-authenticate']);

+                if (strstr($this->incoming_headers['www-authenticate'], "Digest ")) {

+                    $this->debug('Server wants digest authentication');

+                    // remove "Digest " from our elements

+                    $digestString = str_replace('Digest ', '', $this->incoming_headers['www-authenticate']);

+

+                    // parse elements into array

+                    $digestElements = explode(',', $digestString);

+                    foreach ($digestElements as $val) {

+                        $tempElement = explode('=', trim($val), 2);

+                        $digestRequest[$tempElement[0]] = str_replace("\"", '', $tempElement[1]);

+                    }

+

+                // should have (at least) qop, realm, nonce

+                    if (isset($digestRequest['nonce'])) {

+                        $this->setCredentials($this->username, $this->password, 'digest', $digestRequest);

+                        $this->tryagain = true;

+                        return false;

+                    }

+                }

+            $this->debug('HTTP authentication failed');

+            $this->setError('HTTP authentication failed');

+            return false;

+            }

+

+        if (

+            ($http_status >= 300 && $http_status <= 307) ||

+            ($http_status >= 400 && $http_status <= 417) ||

+            ($http_status >= 501 && $http_status <= 505)

+            ) {

+            $this->setError("Unsupported HTTP response status $http_status $http_reason (soapclient->response has contents of the response)");

+            return false;

+        }

+

+        // decode content-encoding

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

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

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

+                if(function_exists('gzinflate')){

+                    //$timer->setMarker('starting decoding of gzip/deflated content');

+                    // IIS 5 requires gzinflate instead of gzuncompress (similar to IE 5 and gzdeflate v. gzcompress)

+                    // this means there are no Zlib headers, although there should be

+                    $this->debug('The gzinflate function exists');

+                    $datalen = strlen($data);

+                    if ($this->incoming_headers['content-encoding'] == 'deflate') {

+                        if ($degzdata = @gzinflate($data)) {

+                            $data = $degzdata;

+                            $this->debug('The payload has been inflated to ' . strlen($data) . ' bytes');

+                            if (strlen($data) < $datalen) {

+                                // test for the case that the payload has been compressed twice

+                                $this->debug('The inflated payload is smaller than the gzipped one; try again');

+                                if ($degzdata = @gzinflate($data)) {

+                                    $data = $degzdata;

+                                    $this->debug('The payload has been inflated again to ' . strlen($data) . ' bytes');

+                                }

+                            }

+                        } else {

+                            $this->debug('Error using gzinflate to inflate the payload');

+                            $this->setError('Error using gzinflate to inflate the payload');

+                        }

+                    } elseif ($this->incoming_headers['content-encoding'] == 'gzip') {

+                        if ($degzdata = @gzinflate(substr($data, 10))) {	// do our best

+                            $data = $degzdata;

+                            $this->debug('The payload has been un-gzipped to ' . strlen($data) . ' bytes');

+                            if (strlen($data) < $datalen) {

+                                // test for the case that the payload has been compressed twice

+                                $this->debug('The un-gzipped payload is smaller than the gzipped one; try again');

+                                if ($degzdata = @gzinflate(substr($data, 10))) {

+                                    $data = $degzdata;

+                                    $this->debug('The payload has been un-gzipped again to ' . strlen($data) . ' bytes');

+                                }

+                            }

+                        } else {

+                            $this->debug('Error using gzinflate to un-gzip the payload');

+                            $this->setError('Error using gzinflate to un-gzip the payload');

+                        }

+                    }

+                    //$timer->setMarker('finished decoding of gzip/deflated content');

+                    //print "<xmp>\nde-inflated:\n---------------\n$data\n-------------\n</xmp>";

+                    // set decoded payload

+                    $this->incoming_payload = $header_data.$lb.$lb.$data;

+                } else {

+                    $this->debug('The server sent compressed data. Your php install must have the Zlib extension compiled in to support this.');

+                    $this->setError('The server sent compressed data. Your php install must have the Zlib extension compiled in to support this.');

+                }

+            } else {

+                $this->debug('Unsupported Content-Encoding ' . $this->incoming_headers['content-encoding']);

+                $this->setError('Unsupported Content-Encoding ' . $this->incoming_headers['content-encoding']);

+            }

+        } else {

+            $this->debug('No Content-Encoding header');

+        }

+

+        if(strlen($data) == 0){

+            $this->debug('no data after headers!');

+            $this->setError('no data present after HTTP headers');

+            return false;

+        }

+

+        return $data;

+    }

+

+    /**

+     * sets the content-type for the SOAP message to be sent

+     *

+     * @param	string $type the content type, MIME style

+     * @param	mixed $charset character set used for encoding (or false)

+     * @access	public

+     */

+    function setContentType($type, $charset = false) {

+        $this->setHeader('Content-Type', $type . ($charset ? '; charset=' . $charset : ''));

+    }

+

+    /**

+     * specifies that an HTTP persistent connection should be used

+     *

+     * @return	boolean whether the request was honored by this method.

+     * @access	public

+     */

+    function usePersistentConnection(){

+        if (isset($this->outgoing_headers['Accept-Encoding'])) {

+            return false;

+        }

+        $this->protocol_version = '1.1';

+        $this->persistentConnection = true;

+        $this->setHeader('Connection', 'Keep-Alive');

+        return true;

+    }

+

+    /**

+     * parse an incoming Cookie into it's parts

+     *

+     * @param	string $cookie_str content of cookie

+     * @return	array with data of that cookie

+     * @access	private

+     */

+    /*

 	 * TODO: allow a Set-Cookie string to be parsed into multiple cookies

 	 */

-	function parseCookie($cookie_str) {

-		$cookie_str = str_replace('; ', ';', $cookie_str) . ';';

-		$data = preg_split('/;/', $cookie_str);

-		$value_str = $data[0];

-

-		$cookie_param = 'domain=';

-		$start = strpos($cookie_str, $cookie_param);

-		if ($start > 0) {

-			$domain = substr($cookie_str, $start + strlen($cookie_param));

-			$domain = substr($domain, 0, strpos($domain, ';'));

-		} else {

-			$domain = '';

-		}

-

-		$cookie_param = 'expires=';

-		$start = strpos($cookie_str, $cookie_param);

-		if ($start > 0) {

-			$expires = substr($cookie_str, $start + strlen($cookie_param));

-			$expires = substr($expires, 0, strpos($expires, ';'));

-		} else {

-			$expires = '';

-		}

-

-		$cookie_param = 'path=';

-		$start = strpos($cookie_str, $cookie_param);

-		if ( $start > 0 ) {

-			$path = substr($cookie_str, $start + strlen($cookie_param));

-			$path = substr($path, 0, strpos($path, ';'));

-		} else {

-			$path = '/';

-		}

-

-		$cookie_param = ';secure;';

-		if (strpos($cookie_str, $cookie_param) !== FALSE) {

-			$secure = true;

-		} else {

-			$secure = false;

-		}

-

-		$sep_pos = strpos($value_str, '=');

-

-		if ($sep_pos) {

-			$name = substr($value_str, 0, $sep_pos);

-			$value = substr($value_str, $sep_pos + 1);

-			$cookie= array(	'name' => $name,

-			                'value' => $value,

-							'domain' => $domain,

-							'path' => $path,

-							'expires' => $expires,

-							'secure' => $secure

-							);

-			return $cookie;

-		}

-		return false;

-	}

-

-	/**

-	 * sort out cookies for the current request

-	 *

-	 * @param	array $cookies array with all cookies

-	 * @param	boolean $secure is the send-content secure or not?

-	 * @return	string for Cookie-HTTP-Header

-	 * @access	private

-	 */

-	function getCookiesForRequest($cookies, $secure=false) {

-		$cookie_str = '';

-		if ((! is_null($cookies)) && (is_array($cookies))) {

-			foreach ($cookies as $cookie) {

-				if (! is_array($cookie)) {

-					continue;

-				}

-	    		$this->debug("check cookie for validity: ".$cookie['name'].'='.$cookie['value']);

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

-					if (strtotime($cookie['expires']) <= time()) {

-						$this->debug('cookie has expired');

-						continue;

-					}

-				}

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

-					$domain = preg_quote($cookie['domain']);

-					if (! preg_match("'.*$domain$'i", $this->host)) {

-						$this->debug('cookie has different domain');

-						continue;

-					}

-				}

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

-					$path = preg_quote($cookie['path']);

-					if (! preg_match("'^$path.*'i", $this->path)) {

-						$this->debug('cookie is for a different path');

-						continue;

-					}

-				}

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

-					$this->debug('cookie is secure, transport is not');

-					continue;

-				}

-				$cookie_str .= $cookie['name'] . '=' . $cookie['value'] . '; ';

-	    		$this->debug('add cookie to Cookie-String: ' . $cookie['name'] . '=' . $cookie['value']);

-			}

-		}

-		return $cookie_str;

-  }

+    function parseCookie($cookie_str) {

+        $cookie_str = str_replace('; ', ';', $cookie_str) . ';';

+        $data = preg_split('/;/', $cookie_str);

+        $value_str = $data[0];

+

+        $cookie_param = 'domain=';

+        $start = strpos($cookie_str, $cookie_param);

+        if ($start > 0) {

+            $domain = substr($cookie_str, $start + strlen($cookie_param));

+            $domain = substr($domain, 0, strpos($domain, ';'));

+        } else {

+            $domain = '';

+        }

+

+        $cookie_param = 'expires=';

+        $start = strpos($cookie_str, $cookie_param);

+        if ($start > 0) {

+            $expires = substr($cookie_str, $start + strlen($cookie_param));

+            $expires = substr($expires, 0, strpos($expires, ';'));

+        } else {

+            $expires = '';

+        }

+

+        $cookie_param = 'path=';

+        $start = strpos($cookie_str, $cookie_param);

+        if ( $start > 0 ) {

+            $path = substr($cookie_str, $start + strlen($cookie_param));

+            $path = substr($path, 0, strpos($path, ';'));

+        } else {

+            $path = '/';

+        }

+

+        $cookie_param = ';secure;';

+        if (strpos($cookie_str, $cookie_param) !== FALSE) {

+            $secure = true;

+        } else {

+            $secure = false;

+        }

+

+        $sep_pos = strpos($value_str, '=');

+

+        if ($sep_pos) {

+            $name = substr($value_str, 0, $sep_pos);

+            $value = substr($value_str, $sep_pos + 1);

+            $cookie= array(	'name' => $name,

+                            'value' => $value,

+                            'domain' => $domain,

+                            'path' => $path,

+                            'expires' => $expires,

+                            'secure' => $secure

+                            );

+            return $cookie;

+        }

+        return false;

+    }

+

+    /**

+     * sort out cookies for the current request

+     *

+     * @param	array $cookies array with all cookies

+     * @param	boolean $secure is the send-content secure or not?

+     * @return	string for Cookie-HTTP-Header

+     * @access	private

+     */

+    function getCookiesForRequest($cookies, $secure=false) {

+        $cookie_str = '';

+        if ((! is_null($cookies)) && (is_array($cookies))) {

+            foreach ($cookies as $cookie) {

+                if (! is_array($cookie)) {

+                    continue;

+                }

+                $this->debug("check cookie for validity: ".$cookie['name'].'='.$cookie['value']);

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

+                    if (strtotime($cookie['expires']) <= time()) {

+                        $this->debug('cookie has expired');

+                        continue;

+                    }

+                }

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

+                    $domain = preg_quote($cookie['domain']);

+                    if (! preg_match("'.*$domain$'i", $this->host)) {

+                        $this->debug('cookie has different domain');

+                        continue;

+                    }

+                }

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

+                    $path = preg_quote($cookie['path']);

+                    if (! preg_match("'^$path.*'i", $this->path)) {

+                        $this->debug('cookie is for a different path');

+                        continue;

+                    }

+                }

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

+                    $this->debug('cookie is secure, transport is not');

+                    continue;

+                }

+                $cookie_str .= $cookie['name'] . '=' . $cookie['value'] . '; ';

+                $this->debug('add cookie to Cookie-String: ' . $cookie['name'] . '=' . $cookie['value']);

+            }

+        }

+        return $cookie_str;

+    }

 }

 

 

Spacing +136 added lines, -136 removed lines

@@ -26,18 +26,18 @@ 
 	var $incoming_cookies = array();

 	var $outgoing_payload = '';

 	var $incoming_payload = '';

-	var $response_status_line;	// HTTP response status line

+	var $response_status_line; // HTTP response status line

 	var $useSOAPAction = true;

 	var $persistentConnection = false;

-	var $ch = false;	// cURL handle

-	var $ch_options = array();	// cURL custom options

-	var $use_curl = false;		// force cURL use

-	var $proxy = null;			// proxy information (associative array)

+	var $ch = false; // cURL handle

+	var $ch_options = array(); // cURL custom options

+	var $use_curl = false; // force cURL use

+	var $proxy = null; // proxy information (associative array)

 	var $username = '';

 	var $password = '';

 	var $authtype = '';

 	var $digestRequest = array();

-	var $certRequest = array();	// keys must be cainfofile (optional), sslcertfile, sslkeyfile, passphrase, certpassword (optional), verifypeer (optional), verifyhost (optional)

+	var $certRequest = array(); // keys must be cainfofile (optional), sslcertfile, sslkeyfile, passphrase, certpassword (optional), verifypeer (optional), verifyhost (optional)

 								// cainfofile: certificate authority file, e.g. '$pathToPemFiles/rootca.pem'

 								// sslcertfile: SSL certificate file, e.g. '$pathToPemFiles/mycert.pem'

 								// sslkeyfile: SSL key file, e.g. '$pathToPemFiles/mykey.pem'

@@ -54,7 +54,7 @@ 
 	* @param boolean $use_curl Whether to try to force cURL use

 	* @access public

 	*/

-	function __construct($url, $curl_options = NULL, $use_curl = false){

+	function __construct($url, $curl_options = NULL, $use_curl = false) {

 		parent::__construct();

 		$this->debug("ctor url=$url use_curl=$use_curl curl_options:");

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

@@ -63,7 +63,7 @@ 
 			$this->ch_options = $curl_options;

 		}

 		$this->use_curl = $use_curl;

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

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

 		$this->setHeader('User-Agent', $this->title.'/'.$this->version.' ('.$rev[1].')');

 	}

 

@@ -115,19 +115,19 @@ 
 		$this->url = $url;

 

 		$u = parse_url($url);

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

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

 			$this->debug("parsed URL $k = $v");

 			$this->$k = $v;

 		}

 

 		// add any GET params to path

-		if(isset($u['query']) && $u['query'] != ''){

-            $this->path .= '?' . $u['query'];

+		if (isset($u['query']) && $u['query'] != '') {

+            $this->path .= '?'.$u['query'];

 		}

 

 		// set default port

-		if(!isset($u['port'])){

-			if($u['scheme'] == 'https'){

+		if (!isset($u['port'])) {

+			if ($u['scheme'] == 'https') {

 				$this->port = 443;

 			} else {

 				$this->port = 80;

@@ -171,7 +171,7 @@ 
 	* @return	boolean true if connected, false if not

 	* @access   private

 	*/

-	function connect($connection_timeout=0,$response_timeout=30){

+	function connect($connection_timeout = 0, $response_timeout = 30) {

 	  	// For PHP 4.3 with OpenSSL, change https scheme to ssl, then treat like

 	  	// "regular" socket.

 	  	// TODO: disabled for now because OpenSSL must be *compiled* in (not just

@@ -195,7 +195,7 @@ 
 		}

 

 		// use persistent connection

-		if($this->persistentConnection && isset($this->fp) && is_resource($this->fp)){

+		if ($this->persistentConnection && isset($this->fp) && is_resource($this->fp)) {

 			if (!feof($this->fp)) {

 				$this->debug('Re-use persistent connection');

 				return true;

@@ -206,20 +206,20 @@ 
 

 		// munge host if using OpenSSL

 		if ($this->scheme == 'ssl') {

-			$host = 'ssl://' . $host;

+			$host = 'ssl://'.$host;

 		}

-		$this->debug('calling fsockopen with host ' . $host . ' connection_timeout ' . $connection_timeout);

+		$this->debug('calling fsockopen with host '.$host.' connection_timeout '.$connection_timeout);

 

 		// open socket

-		if($connection_timeout > 0){

-			$this->fp = @fsockopen( $host, $this->port, $this->errno, $this->error_str, $connection_timeout);

+		if ($connection_timeout > 0) {

+			$this->fp = @fsockopen($host, $this->port, $this->errno, $this->error_str, $connection_timeout);

 		} else {

-			$this->fp = @fsockopen( $host, $this->port, $this->errno, $this->error_str);

+			$this->fp = @fsockopen($host, $this->port, $this->errno, $this->error_str);

 		}

 

 		// test pointer

-		if(!$this->fp) {

-			$msg = 'Couldn\'t open socket connection to server ' . $this->url;

+		if (!$this->fp) {

+			$msg = 'Couldn\'t open socket connection to server '.$this->url;

 			if ($this->errno) {

 				$msg .= ', Error ('.$this->errno.'): '.$this->error_str;

 			} else {

@@ -231,8 +231,8 @@ 
 		}

 

 		// set response timeout

-		$this->debug('set response timeout to ' . $response_timeout);

-		socket_set_timeout( $this->fp, $response_timeout);

+		$this->debug('set response timeout to '.$response_timeout);

+		socket_set_timeout($this->fp, $response_timeout);

 

 		$this->debug('socket connected');

 		return true;

@@ -391,8 +391,8 @@ 
 		$this->debug('cURL connection set up');

 		return true;

 	  } else {

-		$this->setError('Unknown scheme ' . $this->scheme);

-		$this->debug('Unknown scheme ' . $this->scheme);

+		$this->setError('Unknown scheme '.$this->scheme);

+		$this->debug('Unknown scheme '.$this->scheme);

 		return false;

 	  }

 	}

@@ -407,7 +407,7 @@ 
 	* @return	string data

 	* @access   public

 	*/

-	function send($data, $timeout=0, $response_timeout=30, $cookies=NULL) {

+	function send($data, $timeout = 0, $response_timeout = 30, $cookies = NULL) {

 

 		$this->debug('entered send() with data of length: '.strlen($data));

 

@@ -417,12 +417,12 @@ 
 			$this->tryagain = false;

 			if ($tries++ < 2) {

 				// make connnection

-				if (!$this->connect($timeout, $response_timeout)){

+				if (!$this->connect($timeout, $response_timeout)) {

 					return false;

 				}

 

 				// send request

-				if (!$this->sendRequest($data, $cookies)){

+				if (!$this->sendRequest($data, $cookies)) {

 					return false;

 				}

 

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

 	* @deprecated

 	*/

-	function sendHTTPS($data, $timeout=0, $response_timeout=30, $cookies) {

+	function sendHTTPS($data, $timeout = 0, $response_timeout = 30, $cookies) {

 		return $this->send($data, $timeout, $response_timeout, $cookies);

 	}

 

@@ -469,7 +469,7 @@ 
 		$this->appendDebug($this->varDump($certRequest));

 		// cf. RFC 2617

 		if ($authtype == 'basic') {

-			$this->setHeader('Authorization', 'Basic '.base64_encode(str_replace(':','',$username).':'.$password));

+			$this->setHeader('Authorization', 'Basic '.base64_encode(str_replace(':', '', $username).':'.$password));

 		} elseif ($authtype == 'digest') {

 			if (isset($digestRequest['nonce'])) {

 				$digestRequest['nc'] = isset($digestRequest['nc']) ? $digestRequest['nc']++ : 1;

@@ -477,16 +477,16 @@ 
 				// calculate the Digest hashes (calculate code based on digest implementation found at: http://www.rassoc.com/gregr/weblog/stories/2002/07/09/webServicesSecurityHttpDigestAuthenticationWithoutActiveDirectory.html)

 

 				// A1 = unq(username-value) ":" unq(realm-value) ":" passwd

-				$A1 = $username. ':' . (isset($digestRequest['realm']) ? $digestRequest['realm'] : '') . ':' . $password;

+				$A1 = $username.':'.(isset($digestRequest['realm']) ? $digestRequest['realm'] : '').':'.$password;

 

 				// H(A1) = MD5(A1)

 				$HA1 = md5($A1);

 

 				// A2 = Method ":" digest-uri-value

-				$A2 = $this->request_method . ':' . $this->digest_uri;

+				$A2 = $this->request_method.':'.$this->digest_uri;

 

 				// H(A2)

-				$HA2 =  md5($A2);

+				$HA2 = md5($A2);

 

 				// KD(secret, data) = H(concat(secret, ":", data))

 				// if qop == auth:

@@ -503,19 +503,19 @@ 
 				$nonce = isset($digestRequest['nonce']) ? $digestRequest['nonce'] : '';

 				$cnonce = $nonce;

 				if ($digestRequest['qop'] != '') {

-					$unhashedDigest = $HA1 . ':' . $nonce . ':' . sprintf("%08d", $digestRequest['nc']) . ':' . $cnonce . ':' . $digestRequest['qop'] . ':' . $HA2;

+					$unhashedDigest = $HA1.':'.$nonce.':'.sprintf("%08d", $digestRequest['nc']).':'.$cnonce.':'.$digestRequest['qop'].':'.$HA2;

 				} else {

-					$unhashedDigest = $HA1 . ':' . $nonce . ':' . $HA2;

+					$unhashedDigest = $HA1.':'.$nonce.':'.$HA2;

 				}

 

 				$hashedDigest = md5($unhashedDigest);

 

 				$opaque = '';

 				if (isset($digestRequest['opaque'])) {

-					$opaque = ', opaque="' . $digestRequest['opaque'] . '"';

+					$opaque = ', opaque="'.$digestRequest['opaque'].'"';

 				}

 

-				$this->setHeader('Authorization', 'Digest username="' . $username . '", realm="' . $digestRequest['realm'] . '", nonce="' . $nonce . '", uri="' . $this->digest_uri . $opaque . '", cnonce="' . $cnonce . '", nc=' . sprintf("%08x", $digestRequest['nc']) . ', qop="' . $digestRequest['qop'] . '", response="' . $hashedDigest . '"');

+				$this->setHeader('Authorization', 'Digest username="'.$username.'", realm="'.$digestRequest['realm'].'", nonce="'.$nonce.'", uri="'.$this->digest_uri.$opaque.'", cnonce="'.$cnonce.'", nc='.sprintf("%08x", $digestRequest['nc']).', qop="'.$digestRequest['qop'].'", response="'.$hashedDigest.'"');

 			}

 		} elseif ($authtype == 'certificate') {

 			$this->certRequest = $certRequest;

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

 	*/

 	function setSOAPAction($soapaction) {

-		$this->setHeader('SOAPAction', '"' . $soapaction . '"');

+		$this->setHeader('SOAPAction', '"'.$soapaction.'"');

 	}

 

 	/**

@@ -546,7 +546,7 @@ 
 	* @param    string $enc encoding style. supported values: gzip, deflate, or both

 	* @access   public

 	*/

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

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

 		if (function_exists('gzdeflate')) {

 			$this->protocol_version = '1.1';

 			$this->setHeader('Accept-Encoding', $enc);

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

 	 */

 	function isSkippableCurlHeader(&$data) {

-		$skipHeaders = array(	'HTTP/1.1 100',

+		$skipHeaders = array('HTTP/1.1 100',

 								'HTTP/1.0 301',

 								'HTTP/1.1 301',

 								'HTTP/1.0 302',

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

 	* @deprecated

 	*/

-	function decodeChunked($buffer, $lb){

+	function decodeChunked($buffer, $lb) {

 		// length := 0

 		$length = 0;

 		$new = '';

@@ -637,17 +637,17 @@ 
 			$this->debug('no linebreak found in decodeChunked');

 			return $new;

 		}

-		$temp = substr($buffer,0,$chunkend);

-		$chunk_size = hexdec( trim($temp) );

+		$temp = substr($buffer, 0, $chunkend);

+		$chunk_size = hexdec(trim($temp));

 		$chunkstart = $chunkend + strlen($lb);

 		// while (chunk-size > 0) {

 		while ($chunk_size > 0) {

 			$this->debug("chunkstart: $chunkstart chunk_size: $chunk_size");

-			$chunkend = strpos( $buffer, $lb, $chunkstart + $chunk_size);

+			$chunkend = strpos($buffer, $lb, $chunkstart + $chunk_size);

 

 			// Just in case we got a broken connection

 		  	if ($chunkend == FALSE) {

-		  	    $chunk = substr($buffer,$chunkstart);

+		  	    $chunk = substr($buffer, $chunkstart);

 				// append chunk-data to entity-body

 		    	$new .= $chunk;

 		  	    $length += strlen($chunk);

@@ -655,7 +655,7 @@ 
 			}

 

 		  	// read chunk-data and CRLF

-		  	$chunk = substr($buffer,$chunkstart,$chunkend-$chunkstart);

+		  	$chunk = substr($buffer, $chunkstart, $chunkend - $chunkstart);

 		  	// append chunk-data to entity-body

 		  	$new .= $chunk;

 		  	// length := length + chunk-size

@@ -667,8 +667,8 @@ 
 			if ($chunkend == FALSE) {

 				break; //Just in case we got a broken connection

 			}

-			$temp = substr($buffer,$chunkstart,$chunkend-$chunkstart);

-			$chunk_size = hexdec( trim($temp) );

+			$temp = substr($buffer, $chunkstart, $chunkend - $chunkstart);

+			$chunk_size = hexdec(trim($temp));

 			$chunkstart = $chunkend;

 		}

 		return $new;

@@ -703,7 +703,7 @@ 
 		$this->outgoing_payload = "$req\r\n";

 

 		// loop thru headers, serializing

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

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

 			$hdr = $k.': '.$v;

 			$this->debug("HTTP header: $hdr");

 			$this->outgoing_payload .= "$hdr\r\n";

@@ -740,12 +740,12 @@ 
 

 	  if ($this->io_method() == 'socket') {

 		// send payload

-		if(!fputs($this->fp, $this->outgoing_payload, strlen($this->outgoing_payload))) {

+		if (!fputs($this->fp, $this->outgoing_payload, strlen($this->outgoing_payload))) {

 			$this->setError('couldn\'t write message data to socket');

 			$this->debug('couldn\'t write message data to socket');

 			return false;

 		}

-		$this->debug('wrote data to socket, length = ' . strlen($this->outgoing_payload));

+		$this->debug('wrote data to socket, length = '.strlen($this->outgoing_payload));

 		return true;

 	  } else if ($this->io_method() == 'curl') {

 		// set payload

@@ -754,7 +754,7 @@ 
 		// some servers refuse to work with (so we no longer use this method!)

 		//$this->setCurlOption(CURLOPT_CUSTOMREQUEST, $this->outgoing_payload);

 		$curl_headers = array();

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

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

 			if ($k == 'Connection' || $k == 'Content-Length' || $k == 'Host' || $k == 'Authorization' || $k == 'Proxy-Authorization') {

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

 			} else {

@@ -762,7 +762,7 @@ 
 			}

 		}

 		if ($cookie_str != '') {

-			$curl_headers[] = 'Cookie: ' . $cookie_str;

+			$curl_headers[] = 'Cookie: '.$cookie_str;

 		}

 		$this->setCurlOption(CURLOPT_HTTPHEADER, $curl_headers);

 		$this->debug('set cURL HTTP headers');

@@ -788,62 +788,62 @@ 
 	* @return	string the response (also sets member variables like incoming_payload)

 	* @access   private

 	*/

-	function getResponse(){

+	function getResponse() {

 		$this->incoming_payload = '';

 

 	  if ($this->io_method() == 'socket') {

 	    // loop until headers have been retrieved

 	    $data = '';

-	    while (!isset($lb)){

+	    while (!isset($lb)) {

 

 			// We might EOF during header read.

-			if(feof($this->fp)) {

+			if (feof($this->fp)) {

 				$this->incoming_payload = $data;

-				$this->debug('found no headers before EOF after length ' . strlen($data));

-				$this->debug("received before EOF:\n" . $data);

+				$this->debug('found no headers before EOF after length '.strlen($data));

+				$this->debug("received before EOF:\n".$data);

 				$this->setError('server failed to send headers');

 				return false;

 			}

 

 			$tmp = fgets($this->fp, 256);

 			$tmplen = strlen($tmp);

-			$this->debug("read line of $tmplen bytes: " . trim($tmp));

+			$this->debug("read line of $tmplen bytes: ".trim($tmp));

 

 			if ($tmplen == 0) {

 				$this->incoming_payload = $data;

-				$this->debug('socket read of headers timed out after length ' . strlen($data));

-				$this->debug("read before timeout: " . $data);

+				$this->debug('socket read of headers timed out after length '.strlen($data));

+				$this->debug("read before timeout: ".$data);

 				$this->setError('socket read of headers timed out');

 				return false;

 			}

 

 			$data .= $tmp;

-			$pos = strpos($data,"\r\n\r\n");

-			if($pos > 1){

+			$pos = strpos($data, "\r\n\r\n");

+			if ($pos > 1) {

 				$lb = "\r\n";

 			} else {

-				$pos = strpos($data,"\n\n");

-				if($pos > 1){

+				$pos = strpos($data, "\n\n");

+				if ($pos > 1) {

 					$lb = "\n";

 				}

 			}

 			// remove 100 headers

-			if (isset($lb) && preg_match('/^HTTP\/1.1 100/',$data)) {

+			if (isset($lb) && preg_match('/^HTTP\/1.1 100/', $data)) {

 				unset($lb);

 				$data = '';

 			}//

 		}

 		// store header data

 		$this->incoming_payload .= $data;

-		$this->debug('found end of headers after length ' . strlen($data));

+		$this->debug('found end of headers after length '.strlen($data));

 		// process headers

-		$header_data = trim(substr($data,0,$pos));

-		$header_array = explode($lb,$header_data);

+		$header_data = trim(substr($data, 0, $pos));

+		$header_array = explode($lb, $header_data);

 		$this->incoming_headers = array();

 		$this->incoming_cookies = array();

-		foreach($header_array as $header_line){

-			$arr = explode(':',$header_line, 2);

-			if(count($arr) > 1){

+		foreach ($header_array as $header_line) {

+			$arr = explode(':', $header_line, 2);

+			if (count($arr) > 1) {

 				$header_name = strtolower(trim($arr[0]));

 				$this->incoming_headers[$header_name] = trim($arr[1]);

 				if ($header_name == 'set-cookie') {

@@ -851,20 +851,20 @@ 
 					$cookie = $this->parseCookie(trim($arr[1]));

 					if ($cookie) {

 						$this->incoming_cookies[] = $cookie;

-						$this->debug('found cookie: ' . $cookie['name'] . ' = ' . $cookie['value']);

+						$this->debug('found cookie: '.$cookie['name'].' = '.$cookie['value']);

 					} else {

-						$this->debug('did not find cookie in ' . trim($arr[1]));

+						$this->debug('did not find cookie in '.trim($arr[1]));

 					}

     			}

 			} else if (isset($header_name)) {

 				// append continuation line to previous header

-				$this->incoming_headers[$header_name] .= $lb . ' ' . $header_line;

+				$this->incoming_headers[$header_name] .= $lb.' '.$header_line;

 			}

 		}

 

 		// loop until msg has been received

 		if (isset($this->incoming_headers['transfer-encoding']) && strtolower($this->incoming_headers['transfer-encoding']) == 'chunked') {

-			$content_length =  2147483647;	// ignore any content-length header

+			$content_length = 2147483647; // ignore any content-length header

 			$chunked = true;

 			$this->debug("want to read chunked content");

 		} elseif (isset($this->incoming_headers['content-length'])) {

@@ -872,7 +872,7 @@ 
 			$chunked = false;

 			$this->debug("want to read content of length $content_length");

 		} else {

-			$content_length =  2147483647;

+			$content_length = 2147483647;

 			$chunked = false;

 			$this->debug("want to read content to EOF");

 		}

@@ -884,8 +884,8 @@ 
 				$this->debug("read chunk line of $tmplen bytes");

 				if ($tmplen == 0) {

 					$this->incoming_payload = $data;

-					$this->debug('socket read of chunk length timed out after length ' . strlen($data));

-					$this->debug("read before timeout:\n" . $data);

+					$this->debug('socket read of chunk length timed out after length '.strlen($data));

+					$this->debug("read before timeout:\n".$data);

 					$this->setError('socket read of chunk length timed out');

 					return false;

 				}

@@ -900,8 +900,8 @@ 
 				$this->debug("read buffer of $tmplen bytes");

 				if (($tmplen == 0) && (!feof($this->fp))) {

 					$this->incoming_payload = $data;

-					$this->debug('socket read of body timed out after length ' . strlen($data));

-					$this->debug("read before timeout:\n" . $data);

+					$this->debug('socket read of body timed out after length '.strlen($data));

+					$this->debug("read before timeout:\n".$data);

 					$this->setError('socket read of body timed out');

 					return false;

 				}

@@ -914,8 +914,8 @@ 
 				$this->debug("read chunk terminator of $tmplen bytes");

 				if ($tmplen == 0) {

 					$this->incoming_payload = $data;

-					$this->debug('socket read of chunk terminator timed out after length ' . strlen($data));

-					$this->debug("read before timeout:\n" . $data);

+					$this->debug('socket read of chunk terminator timed out after length '.strlen($data));

+					$this->debug("read before timeout:\n".$data);

 					$this->setError('socket read of chunk terminator timed out');

 					return false;

 				}

@@ -924,21 +924,21 @@ 
 		if (feof($this->fp)) {

 			$this->debug('read to EOF');

 		}

-		$this->debug('read body of length ' . strlen($data));

+		$this->debug('read body of length '.strlen($data));

 		$this->incoming_payload .= $data;

 		$this->debug('received a total of '.strlen($this->incoming_payload).' bytes of data from server');

 

 		// close filepointer

-		if(

+		if (

 			(isset($this->incoming_headers['connection']) && strtolower($this->incoming_headers['connection']) == 'close') ||

-			(! $this->persistentConnection) || feof($this->fp)){

+			(!$this->persistentConnection) || feof($this->fp)) {

 			fclose($this->fp);

 			$this->fp = false;

 			$this->debug('closed socket');

 		}

 

 		// connection was closed unexpectedly

-		if($this->incoming_payload == ''){

+		if ($this->incoming_payload == '') {

 			$this->setError('no response from server');

 			return false;

 		}

@@ -964,7 +964,7 @@ 
 		if ($cErr != '') {

         	$err = 'cURL ERROR: '.curl_errno($this->ch).': '.$cErr.'<br>';

         	// TODO: there is a PHP bug that can cause this to SEGV for CURLINFO_CONTENT_TYPE

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

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

 				$err .= "$k: $v<br>";

 			}

 			$this->debug($err);

@@ -984,44 +984,44 @@ 
 		$savedata = $data;

 		while ($this->isSkippableCurlHeader($data)) {

 			$this->debug("Found HTTP header to skip");

-			if ($pos = strpos($data,"\r\n\r\n")) {

-				$data = ltrim(substr($data,$pos));

-			} elseif($pos = strpos($data,"\n\n") ) {

-				$data = ltrim(substr($data,$pos));

+			if ($pos = strpos($data, "\r\n\r\n")) {

+				$data = ltrim(substr($data, $pos));

+			} elseif ($pos = strpos($data, "\n\n")) {

+				$data = ltrim(substr($data, $pos));

 			}

 		}

 

 		if ($data == '') {

 			// have nothing left; just remove 100 header(s)

 			$data = $savedata;

-			while (preg_match('/^HTTP\/1.1 100/',$data)) {

-				if ($pos = strpos($data,"\r\n\r\n")) {

-					$data = ltrim(substr($data,$pos));

-				} elseif($pos = strpos($data,"\n\n") ) {

-					$data = ltrim(substr($data,$pos));

+			while (preg_match('/^HTTP\/1.1 100/', $data)) {

+				if ($pos = strpos($data, "\r\n\r\n")) {

+					$data = ltrim(substr($data, $pos));

+				} elseif ($pos = strpos($data, "\n\n")) {

+					$data = ltrim(substr($data, $pos));

 				}

 			}

 		}

 

 		// separate content from HTTP headers

-		if ($pos = strpos($data,"\r\n\r\n")) {

+		if ($pos = strpos($data, "\r\n\r\n")) {

 			$lb = "\r\n";

-		} elseif( $pos = strpos($data,"\n\n")) {

+		} elseif ($pos = strpos($data, "\n\n")) {

 			$lb = "\n";

 		} else {

 			$this->debug('no proper separation of headers and document');

 			$this->setError('no proper separation of headers and document');

 			return false;

 		}

-		$header_data = trim(substr($data,0,$pos));

-		$header_array = explode($lb,$header_data);

-		$data = ltrim(substr($data,$pos));

+		$header_data = trim(substr($data, 0, $pos));

+		$header_array = explode($lb, $header_data);

+		$data = ltrim(substr($data, $pos));

 		$this->debug('found proper separation of headers and document');

 		$this->debug('cleaned data, stringlen: '.strlen($data));

 		// clean headers

 		foreach ($header_array as $header_line) {

-			$arr = explode(':',$header_line,2);

-			if(count($arr) > 1){

+			$arr = explode(':', $header_line, 2);

+			if (count($arr) > 1) {

 				$header_name = strtolower(trim($arr[0]));

 				$this->incoming_headers[$header_name] = trim($arr[1]);

 				if ($header_name == 'set-cookie') {

@@ -1029,14 +1029,14 @@ 
 					$cookie = $this->parseCookie(trim($arr[1]));

 					if ($cookie) {

 						$this->incoming_cookies[] = $cookie;

-						$this->debug('found cookie: ' . $cookie['name'] . ' = ' . $cookie['value']);

+						$this->debug('found cookie: '.$cookie['name'].' = '.$cookie['value']);

 					} else {

-						$this->debug('did not find cookie in ' . trim($arr[1]));

+						$this->debug('did not find cookie in '.trim($arr[1]));

 					}

     			}

 			} else if (isset($header_name)) {

 				// append continuation line to previous header

-				$this->incoming_headers[$header_name] .= $lb . ' ' . $header_line;

+				$this->incoming_headers[$header_name] .= $lb.' '.$header_line;

 			}

 		}

 	  }

@@ -1049,7 +1049,7 @@ 
 

  		// see if we need to resend the request with http digest authentication

  		if (isset($this->incoming_headers['location']) && ($http_status == 301 || $http_status == 302)) {

- 			$this->debug("Got $http_status $http_reason with Location: " . $this->incoming_headers['location']);

+ 			$this->debug("Got $http_status $http_reason with Location: ".$this->incoming_headers['location']);

  			$this->setURL($this->incoming_headers['location']);

 			$this->tryagain = true;

 			return false;

@@ -1057,7 +1057,7 @@ 
 

  		// see if we need to resend the request with http digest authentication

  		if (isset($this->incoming_headers['www-authenticate']) && $http_status == 401) {

- 			$this->debug("Got 401 $http_reason with WWW-Authenticate: " . $this->incoming_headers['www-authenticate']);

+ 			$this->debug("Got 401 $http_reason with WWW-Authenticate: ".$this->incoming_headers['www-authenticate']);

  			if (strstr($this->incoming_headers['www-authenticate'], "Digest ")) {

  				$this->debug('Server wants digest authentication');

  				// remove "Digest " from our elements

@@ -1092,10 +1092,10 @@ 
 		}

 

 		// decode content-encoding

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

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

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

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

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

-    			if(function_exists('gzinflate')){

+    			if (function_exists('gzinflate')) {

 					//$timer->setMarker('starting decoding of gzip/deflated content');

 					// IIS 5 requires gzinflate instead of gzuncompress (similar to IE 5 and gzdeflate v. gzcompress)

 					// this means there are no Zlib headers, although there should be

@@ -1104,13 +1104,13 @@ 
 					if ($this->incoming_headers['content-encoding'] == 'deflate') {

 						if ($degzdata = @gzinflate($data)) {

 	    					$data = $degzdata;

-	    					$this->debug('The payload has been inflated to ' . strlen($data) . ' bytes');

+	    					$this->debug('The payload has been inflated to '.strlen($data).' bytes');

 	    					if (strlen($data) < $datalen) {

 	    						// test for the case that the payload has been compressed twice

 		    					$this->debug('The inflated payload is smaller than the gzipped one; try again');

 								if ($degzdata = @gzinflate($data)) {

 			    					$data = $degzdata;

-			    					$this->debug('The payload has been inflated again to ' . strlen($data) . ' bytes');

+			    					$this->debug('The payload has been inflated again to '.strlen($data).' bytes');

 								}

 	    					}

 	    				} else {

@@ -1120,13 +1120,13 @@ 
 					} elseif ($this->incoming_headers['content-encoding'] == 'gzip') {

 						if ($degzdata = @gzinflate(substr($data, 10))) {	// do our best

 							$data = $degzdata;

-	    					$this->debug('The payload has been un-gzipped to ' . strlen($data) . ' bytes');

+	    					$this->debug('The payload has been un-gzipped to '.strlen($data).' bytes');

 	    					if (strlen($data) < $datalen) {

 	    						// test for the case that the payload has been compressed twice

 		    					$this->debug('The un-gzipped payload is smaller than the gzipped one; try again');

 								if ($degzdata = @gzinflate(substr($data, 10))) {

 			    					$data = $degzdata;

-			    					$this->debug('The payload has been un-gzipped again to ' . strlen($data) . ' bytes');

+			    					$this->debug('The payload has been un-gzipped again to '.strlen($data).' bytes');

 								}

 	    					}

 	    				} else {

@@ -1143,14 +1143,14 @@ 
 					$this->setError('The server sent compressed data. Your php install must have the Zlib extension compiled in to support this.');

 				}

 			} else {

-				$this->debug('Unsupported Content-Encoding ' . $this->incoming_headers['content-encoding']);

-				$this->setError('Unsupported Content-Encoding ' . $this->incoming_headers['content-encoding']);

+				$this->debug('Unsupported Content-Encoding '.$this->incoming_headers['content-encoding']);

+				$this->setError('Unsupported Content-Encoding '.$this->incoming_headers['content-encoding']);

 			}

 		} else {

 			$this->debug('No Content-Encoding header');

 		}

 

-		if(strlen($data) == 0){

+		if (strlen($data) == 0) {

 			$this->debug('no data after headers!');

 			$this->setError('no data present after HTTP headers');

 			return false;

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

 	 */

 	function setContentType($type, $charset = false) {

-		$this->setHeader('Content-Type', $type . ($charset ? '; charset=' . $charset : ''));

+		$this->setHeader('Content-Type', $type.($charset ? '; charset='.$charset : ''));

 	}

 

 	/**

@@ -1176,7 +1176,7 @@ 
 	 * @return	boolean whether the request was honored by this method.

 	 * @access	public

 	 */

-	function usePersistentConnection(){

+	function usePersistentConnection() {

 		if (isset($this->outgoing_headers['Accept-Encoding'])) {

 			return false;

 		}

@@ -1197,7 +1197,7 @@ 
 	 * TODO: allow a Set-Cookie string to be parsed into multiple cookies

 	 */

 	function parseCookie($cookie_str) {

-		$cookie_str = str_replace('; ', ';', $cookie_str) . ';';

+		$cookie_str = str_replace('; ', ';', $cookie_str).';';

 		$data = preg_split('/;/', $cookie_str);

 		$value_str = $data[0];

 

@@ -1221,7 +1221,7 @@ 
 

 		$cookie_param = 'path=';

 		$start = strpos($cookie_str, $cookie_param);

-		if ( $start > 0 ) {

+		if ($start > 0) {

 			$path = substr($cookie_str, $start + strlen($cookie_param));

 			$path = substr($path, 0, strpos($path, ';'));

 		} else {

@@ -1240,7 +1240,7 @@ 
 		if ($sep_pos) {

 			$name = substr($value_str, 0, $sep_pos);

 			$value = substr($value_str, $sep_pos + 1);

-			$cookie= array(	'name' => $name,

+			$cookie = array('name' => $name,

 			                'value' => $value,

 							'domain' => $domain,

 							'path' => $path,

@@ -1260,40 +1260,40 @@ 
 	 * @return	string for Cookie-HTTP-Header

 	 * @access	private

 	 */

-	function getCookiesForRequest($cookies, $secure=false) {

+	function getCookiesForRequest($cookies, $secure = false) {

 		$cookie_str = '';

-		if ((! is_null($cookies)) && (is_array($cookies))) {

+		if ((!is_null($cookies)) && (is_array($cookies))) {

 			foreach ($cookies as $cookie) {

-				if (! is_array($cookie)) {

+				if (!is_array($cookie)) {

 					continue;

 				}

 	    		$this->debug("check cookie for validity: ".$cookie['name'].'='.$cookie['value']);

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

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

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

 						$this->debug('cookie has expired');

 						continue;

 					}

 				}

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

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

 					$domain = preg_quote($cookie['domain']);

-					if (! preg_match("'.*$domain$'i", $this->host)) {

+					if (!preg_match("'.*$domain$'i", $this->host)) {

 						$this->debug('cookie has different domain');

 						continue;

 					}

 				}

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

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

 					$path = preg_quote($cookie['path']);

-					if (! preg_match("'^$path.*'i", $this->path)) {

+					if (!preg_match("'^$path.*'i", $this->path)) {

 						$this->debug('cookie is for a different path');

 						continue;

 					}

 				}

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

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

 					$this->debug('cookie is secure, transport is not');

 					continue;

 				}

-				$cookie_str .= $cookie['name'] . '=' . $cookie['value'] . '; ';

-	    		$this->debug('add cookie to Cookie-String: ' . $cookie['name'] . '=' . $cookie['value']);

+				$cookie_str .= $cookie['name'].'='.$cookie['value'].'; ';

+	    		$this->debug('add cookie to Cookie-String: '.$cookie['name'].'='.$cookie['value']);

 			}

 		}

 		return $cookie_str;

main/inc/lib/nusoap/nusoapmime.php

Spacing +10 added lines, -10 removed lines

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

 	*/

 	function addAttachment($data, $filename = '', $contenttype = 'application/octet-stream', $cid = false) {

-		if (! $cid) {

+		if (!$cid) {

 			$cid = md5(uniqid(time()));

 		}

 

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

 	*/

     function parseResponse($headers, $data) {

-		$this->debug('Entering parseResponse() for payload of length ' . strlen($data) . ' and type of ' . $headers['content-type']);

+		$this->debug('Entering parseResponse() for payload of length '.strlen($data).' and type of '.$headers['content-type']);

 		$this->responseAttachments = array();

 		if (strstr($headers['content-type'], 'multipart/related')) {

 			$this->debug('Decode multipart/related');

@@ -229,7 +229,7 @@ 
 			foreach ($headers as $k => $v) {

 				$input .= "$k: $v\r\n";

 			}

-			$params['input'] = $input . "\r\n" . $data;

+			$params['input'] = $input."\r\n".$data;

 			$params['include_bodies'] = true;

 			$params['decode_bodies'] = true;

 			$params['decode_headers'] = true;

@@ -238,11 +238,11 @@ 
 

 			foreach ($structure->parts as $part) {

 				if (!isset($part->disposition) && (strstr($part->headers['content-type'], 'text/xml'))) {

-					$this->debug('Have root part of type ' . $part->headers['content-type']);

+					$this->debug('Have root part of type '.$part->headers['content-type']);

 					$root = $part->body;

 					$return = parent::parseResponse($part->headers, $part->body);

 				} else {

-					$this->debug('Have an attachment of type ' . $part->headers['content-type']);

+					$this->debug('Have an attachment of type '.$part->headers['content-type']);

 					$info['data'] = $part->body;

 					$info['filename'] = isset($part->d_parameters['filename']) ? $part->d_parameters['filename'] : '';

 					$info['contenttype'] = $part->headers['content-type'];

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

 	*/

 	function addAttachment($data, $filename = '', $contenttype = 'application/octet-stream', $cid = false) {

-		if (! $cid) {

+		if (!$cid) {

 			$cid = md5(uniqid(time()));

 		}

 

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

 	*/

     function parseRequest($headers, $data) {

-		$this->debug('Entering parseRequest() for payload of length ' . strlen($data) . ' and type of ' . $headers['content-type']);

+		$this->debug('Entering parseRequest() for payload of length '.strlen($data).' and type of '.$headers['content-type']);

 		$this->requestAttachments = array();

 		if (strstr($headers['content-type'], 'multipart/related')) {

 			$this->debug('Decode multipart/related');

@@ -459,7 +459,7 @@ 
 			foreach ($headers as $k => $v) {

 				$input .= "$k: $v\r\n";

 			}

-			$params['input'] = $input . "\r\n" . $data;

+			$params['input'] = $input."\r\n".$data;

 			$params['include_bodies'] = true;

 			$params['decode_bodies'] = true;

 			$params['decode_headers'] = true;

@@ -468,10 +468,10 @@ 
 

 			foreach ($structure->parts as $part) {

 				if (!isset($part->disposition) && (strstr($part->headers['content-type'], 'text/xml'))) {

-					$this->debug('Have root part of type ' . $part->headers['content-type']);

+					$this->debug('Have root part of type '.$part->headers['content-type']);

 					$return = parent::parseRequest($part->headers, $part->body);

 				} else {

-					$this->debug('Have an attachment of type ' . $part->headers['content-type']);

+					$this->debug('Have an attachment of type '.$part->headers['content-type']);

 					$info['data'] = $part->body;

 					$info['filename'] = isset($part->d_parameters['filename']) ? $part->d_parameters['filename'] : '';

 					$info['contenttype'] = $part->headers['content-type'];

Indentation +418 added lines, -418 removed lines

@@ -52,224 +52,224 @@ 
 * @access   public

 */

 class nusoap_client_mime extends nusoap_client {

-	/**

-	 * @var array Each array element in the return is an associative array with keys

-	 * data, filename, contenttype, cid

-	 * @access private

-	 */

-	var $requestAttachments = array();

-	/**

-	 * @var array Each array element in the return is an associative array with keys

-	 * data, filename, contenttype, cid

-	 * @access private

-	 */

-	var $responseAttachments;

-	/**

-	 * @var string

-	 * @access private

-	 */

-	var $mimeContentType;

-

-	/**

-	* adds a MIME attachment to the current request.

-	*

-	* If the $data parameter contains an empty string, this method will read

-	* the contents of the file named by the $filename parameter.

-	*

-	* If the $cid parameter is false, this method will generate the cid.

-	*

-	* @param string $data The data of the attachment

-	* @param string $filename The filename of the attachment (default is empty string)

-	* @param string $contenttype The MIME Content-Type of the attachment (default is application/octet-stream)

-	* @param string $cid The content-id (cid) of the attachment (default is false)

-	* @return string The content-id (cid) of the attachment

-	* @access public

-	*/

-	function addAttachment($data, $filename = '', $contenttype = 'application/octet-stream', $cid = false) {

-		if (! $cid) {

-			$cid = md5(uniqid(time()));

-		}

-

-		$info['data'] = $data;

-		$info['filename'] = $filename;

-		$info['contenttype'] = $contenttype;

-		$info['cid'] = $cid;

-

-		$this->requestAttachments[] = $info;

-

-		return $cid;

-	}

-

-	/**

-	* clears the MIME attachments for the current request.

-	*

-	* @access public

-	*/

-	function clearAttachments() {

-		$this->requestAttachments = array();

-	}

-

-	/**

-	* gets the MIME attachments from the current response.

-	*

-	* Each array element in the return is an associative array with keys

-	* data, filename, contenttype, cid.  These keys correspond to the parameters

-	* for addAttachment.

-	*

-	* @return array The attachments.

-	* @access public

-	*/

-	function getAttachments() {

-		return $this->responseAttachments;

-	}

-

-	/**

-	* gets the HTTP body for the current request.

-	*

-	* @param string $soapmsg The SOAP payload

-	* @return string The HTTP body, which includes the SOAP payload

-	* @access private

-	*/

-	function getHTTPBody($soapmsg) {

-		if (count($this->requestAttachments) > 0) {

-			$params['content_type'] = 'multipart/related; type="text/xml"';

-			$mimeMessage = new Mail_mimePart('', $params);

-			unset($params);

-

-			$params['content_type'] = 'text/xml';

-			$params['encoding']     = '8bit';

-			$params['charset']      = $this->soap_defencoding;

-			$mimeMessage->addSubpart($soapmsg, $params);

-

-			foreach ($this->requestAttachments as $att) {

-				unset($params);

-

-				$params['content_type'] = $att['contenttype'];

-				$params['encoding']     = 'base64';

-				$params['disposition']  = 'attachment';

-				$params['dfilename']    = $att['filename'];

-				$params['cid']          = $att['cid'];

-

-				if ($att['data'] == '' && $att['filename'] <> '') {

-					if ($fd = fopen($att['filename'], 'rb')) {

-						$data = fread($fd, filesize($att['filename']));

-						fclose($fd);

-					} else {

-						$data = '';

-					}

-					$mimeMessage->addSubpart($data, $params);

-				} else {

-					$mimeMessage->addSubpart($att['data'], $params);

-				}

-			}

-

-			$output = $mimeMessage->encode();

-			$mimeHeaders = $output['headers'];

-

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

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

-				if (strtolower($k) == 'content-type') {

-					// PHP header() seems to strip leading whitespace starting

-					// the second line, so force everything to one line

-					$this->mimeContentType = str_replace("\r\n", " ", $v);

-				}

-			}

-

-			return $output['body'];

-		}

-

-		return parent::getHTTPBody($soapmsg);

-	}

-

-	/**

-	* gets the HTTP content type for the current request.

-	*

-	* Note: getHTTPBody must be called before this.

-	*

-	* @return string the HTTP content type for the current request.

-	* @access private

-	*/

-	function getHTTPContentType() {

-		if (count($this->requestAttachments) > 0) {

-			return $this->mimeContentType;

-		}

-		return parent::getHTTPContentType();

-	}

-

-	/**

-	* gets the HTTP content type charset for the current request.

-	* returns false for non-text content types.

-	*

-	* Note: getHTTPBody must be called before this.

-	*

-	* @return string the HTTP content type charset for the current request.

-	* @access private

-	*/

-	function getHTTPContentTypeCharset() {

-		if (count($this->requestAttachments) > 0) {

-			return false;

-		}

-		return parent::getHTTPContentTypeCharset();

-	}

-

-	/**

-	* processes SOAP message returned from server

-	*

-	* @param	array	$headers	The HTTP headers

-	* @param	string	$data		unprocessed response data from server

-	* @return	mixed	value of the message, decoded into a PHP type

-	* @access   private

-	*/

+    /**

+     * @var array Each array element in the return is an associative array with keys

+     * data, filename, contenttype, cid

+     * @access private

+     */

+    var $requestAttachments = array();

+    /**

+     * @var array Each array element in the return is an associative array with keys

+     * data, filename, contenttype, cid

+     * @access private

+     */

+    var $responseAttachments;

+    /**

+     * @var string

+     * @access private

+     */

+    var $mimeContentType;

+

+    /**

+     * adds a MIME attachment to the current request.

+     *

+     * If the $data parameter contains an empty string, this method will read

+     * the contents of the file named by the $filename parameter.

+     *

+     * If the $cid parameter is false, this method will generate the cid.

+     *

+     * @param string $data The data of the attachment

+     * @param string $filename The filename of the attachment (default is empty string)

+     * @param string $contenttype The MIME Content-Type of the attachment (default is application/octet-stream)

+     * @param string $cid The content-id (cid) of the attachment (default is false)

+     * @return string The content-id (cid) of the attachment

+     * @access public

+     */

+    function addAttachment($data, $filename = '', $contenttype = 'application/octet-stream', $cid = false) {

+        if (! $cid) {

+            $cid = md5(uniqid(time()));

+        }

+

+        $info['data'] = $data;

+        $info['filename'] = $filename;

+        $info['contenttype'] = $contenttype;

+        $info['cid'] = $cid;

+

+        $this->requestAttachments[] = $info;

+

+        return $cid;

+    }

+

+    /**

+     * clears the MIME attachments for the current request.

+     *

+     * @access public

+     */

+    function clearAttachments() {

+        $this->requestAttachments = array();

+    }

+

+    /**

+     * gets the MIME attachments from the current response.

+     *

+     * Each array element in the return is an associative array with keys

+     * data, filename, contenttype, cid.  These keys correspond to the parameters

+     * for addAttachment.

+     *

+     * @return array The attachments.

+     * @access public

+     */

+    function getAttachments() {

+        return $this->responseAttachments;

+    }

+

+    /**

+     * gets the HTTP body for the current request.

+     *

+     * @param string $soapmsg The SOAP payload

+     * @return string The HTTP body, which includes the SOAP payload

+     * @access private

+     */

+    function getHTTPBody($soapmsg) {

+        if (count($this->requestAttachments) > 0) {

+            $params['content_type'] = 'multipart/related; type="text/xml"';

+            $mimeMessage = new Mail_mimePart('', $params);

+            unset($params);

+

+            $params['content_type'] = 'text/xml';

+            $params['encoding']     = '8bit';

+            $params['charset']      = $this->soap_defencoding;

+            $mimeMessage->addSubpart($soapmsg, $params);

+

+            foreach ($this->requestAttachments as $att) {

+                unset($params);

+

+                $params['content_type'] = $att['contenttype'];

+                $params['encoding']     = 'base64';

+                $params['disposition']  = 'attachment';

+                $params['dfilename']    = $att['filename'];

+                $params['cid']          = $att['cid'];

+

+                if ($att['data'] == '' && $att['filename'] <> '') {

+                    if ($fd = fopen($att['filename'], 'rb')) {

+                        $data = fread($fd, filesize($att['filename']));

+                        fclose($fd);

+                    } else {

+                        $data = '';

+                    }

+                    $mimeMessage->addSubpart($data, $params);

+                } else {

+                    $mimeMessage->addSubpart($att['data'], $params);

+                }

+            }

+

+            $output = $mimeMessage->encode();

+            $mimeHeaders = $output['headers'];

+

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

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

+                if (strtolower($k) == 'content-type') {

+                    // PHP header() seems to strip leading whitespace starting

+                    // the second line, so force everything to one line

+                    $this->mimeContentType = str_replace("\r\n", " ", $v);

+                }

+            }

+

+            return $output['body'];

+        }

+

+        return parent::getHTTPBody($soapmsg);

+    }

+

+    /**

+     * gets the HTTP content type for the current request.

+     *

+     * Note: getHTTPBody must be called before this.

+     *

+     * @return string the HTTP content type for the current request.

+     * @access private

+     */

+    function getHTTPContentType() {

+        if (count($this->requestAttachments) > 0) {

+            return $this->mimeContentType;

+        }

+        return parent::getHTTPContentType();

+    }

+

+    /**

+     * gets the HTTP content type charset for the current request.

+     * returns false for non-text content types.

+     *

+     * Note: getHTTPBody must be called before this.

+     *

+     * @return string the HTTP content type charset for the current request.

+     * @access private

+     */

+    function getHTTPContentTypeCharset() {

+        if (count($this->requestAttachments) > 0) {

+            return false;

+        }

+        return parent::getHTTPContentTypeCharset();

+    }

+

+    /**

+     * processes SOAP message returned from server

+     *

+     * @param	array	$headers	The HTTP headers

+     * @param	string	$data		unprocessed response data from server

+     * @return	mixed	value of the message, decoded into a PHP type

+     * @access   private

+     */

     function parseResponse($headers, $data) {

-		$this->debug('Entering parseResponse() for payload of length ' . strlen($data) . ' and type of ' . $headers['content-type']);

-		$this->responseAttachments = array();

-		if (strstr($headers['content-type'], 'multipart/related')) {

-			$this->debug('Decode multipart/related');

-			$input = '';

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

-				$input .= "$k: $v\r\n";

-			}

-			$params['input'] = $input . "\r\n" . $data;

-			$params['include_bodies'] = true;

-			$params['decode_bodies'] = true;

-			$params['decode_headers'] = true;

-

-			$structure = Mail_mimeDecode::decode($params);

-

-			foreach ($structure->parts as $part) {

-				if (!isset($part->disposition) && (strstr($part->headers['content-type'], 'text/xml'))) {

-					$this->debug('Have root part of type ' . $part->headers['content-type']);

-					$root = $part->body;

-					$return = parent::parseResponse($part->headers, $part->body);

-				} else {

-					$this->debug('Have an attachment of type ' . $part->headers['content-type']);

-					$info['data'] = $part->body;

-					$info['filename'] = isset($part->d_parameters['filename']) ? $part->d_parameters['filename'] : '';

-					$info['contenttype'] = $part->headers['content-type'];

-					$info['cid'] = $part->headers['content-id'];

-					$this->responseAttachments[] = $info;

-				}

-			}

-

-			if (isset($return)) {

-				$this->responseData = $root;

-				return $return;

-			}

-

-			$this->setError('No root part found in multipart/related content');

-			return '';

-		}

-		$this->debug('Not multipart/related');

-		return parent::parseResponse($headers, $data);

-	}

+        $this->debug('Entering parseResponse() for payload of length ' . strlen($data) . ' and type of ' . $headers['content-type']);

+        $this->responseAttachments = array();

+        if (strstr($headers['content-type'], 'multipart/related')) {

+            $this->debug('Decode multipart/related');

+            $input = '';

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

+                $input .= "$k: $v\r\n";

+            }

+            $params['input'] = $input . "\r\n" . $data;

+            $params['include_bodies'] = true;

+            $params['decode_bodies'] = true;

+            $params['decode_headers'] = true;

+

+            $structure = Mail_mimeDecode::decode($params);

+

+            foreach ($structure->parts as $part) {

+                if (!isset($part->disposition) && (strstr($part->headers['content-type'], 'text/xml'))) {

+                    $this->debug('Have root part of type ' . $part->headers['content-type']);

+                    $root = $part->body;

+                    $return = parent::parseResponse($part->headers, $part->body);

+                } else {

+                    $this->debug('Have an attachment of type ' . $part->headers['content-type']);

+                    $info['data'] = $part->body;

+                    $info['filename'] = isset($part->d_parameters['filename']) ? $part->d_parameters['filename'] : '';

+                    $info['contenttype'] = $part->headers['content-type'];

+                    $info['cid'] = $part->headers['content-id'];

+                    $this->responseAttachments[] = $info;

+                }

+            }

+

+            if (isset($return)) {

+                $this->responseData = $root;

+                return $return;

+            }

+

+            $this->setError('No root part found in multipart/related content');

+            return '';

+        }

+        $this->debug('Not multipart/related');

+        return parent::parseResponse($headers, $data);

+    }

 }

 

 /*

  *	For backwards compatiblity, define soapclientmime unless the PHP SOAP extension is loaded.

  */

 if (!extension_loaded('soap')) {

-	class soapclientmime extends nusoap_client_mime {

-	}

+    class soapclientmime extends nusoap_client_mime {

+    }

 }

 

 /**

@@ -282,214 +282,214 @@ 
 * @access   public

 */

 class nusoap_server_mime extends nusoap_server {

-	/**

-	 * @var array Each array element in the return is an associative array with keys

-	 * data, filename, contenttype, cid

-	 * @access private

-	 */

-	var $requestAttachments = array();

-	/**

-	 * @var array Each array element in the return is an associative array with keys

-	 * data, filename, contenttype, cid

-	 * @access private

-	 */

-	var $responseAttachments;

-	/**

-	 * @var string

-	 * @access private

-	 */

-	var $mimeContentType;

-

-	/**

-	* adds a MIME attachment to the current response.

-	*

-	* If the $data parameter contains an empty string, this method will read

-	* the contents of the file named by the $filename parameter.

-	*

-	* If the $cid parameter is false, this method will generate the cid.

-	*

-	* @param string $data The data of the attachment

-	* @param string $filename The filename of the attachment (default is empty string)

-	* @param string $contenttype The MIME Content-Type of the attachment (default is application/octet-stream)

-	* @param string $cid The content-id (cid) of the attachment (default is false)

-	* @return string The content-id (cid) of the attachment

-	* @access public

-	*/

-	function addAttachment($data, $filename = '', $contenttype = 'application/octet-stream', $cid = false) {

-		if (! $cid) {

-			$cid = md5(uniqid(time()));

-		}

-

-		$info['data'] = $data;

-		$info['filename'] = $filename;

-		$info['contenttype'] = $contenttype;

-		$info['cid'] = $cid;

-

-		$this->responseAttachments[] = $info;

-

-		return $cid;

-	}

-

-	/**

-	* clears the MIME attachments for the current response.

-	*

-	* @access public

-	*/

-	function clearAttachments() {

-		$this->responseAttachments = array();

-	}

-

-	/**

-	* gets the MIME attachments from the current request.

-	*

-	* Each array element in the return is an associative array with keys

-	* data, filename, contenttype, cid.  These keys correspond to the parameters

-	* for addAttachment.

-	*

-	* @return array The attachments.

-	* @access public

-	*/

-	function getAttachments() {

-		return $this->requestAttachments;

-	}

-

-	/**

-	* gets the HTTP body for the current response.

-	*

-	* @param string $soapmsg The SOAP payload

-	* @return string The HTTP body, which includes the SOAP payload

-	* @access private

-	*/

-	function getHTTPBody($soapmsg) {

-		if (count($this->responseAttachments) > 0) {

-			$params['content_type'] = 'multipart/related; type="text/xml"';

-			$mimeMessage = new Mail_mimePart('', $params);

-			unset($params);

-

-			$params['content_type'] = 'text/xml';

-			$params['encoding']     = '8bit';

-			$params['charset']      = $this->soap_defencoding;

-			$mimeMessage->addSubpart($soapmsg, $params);

-

-			foreach ($this->responseAttachments as $att) {

-				unset($params);

-

-				$params['content_type'] = $att['contenttype'];

-				$params['encoding']     = 'base64';

-				$params['disposition']  = 'attachment';

-				$params['dfilename']    = $att['filename'];

-				$params['cid']          = $att['cid'];

-

-				if ($att['data'] == '' && $att['filename'] <> '') {

-					if ($fd = fopen($att['filename'], 'rb')) {

-						$data = fread($fd, filesize($att['filename']));

-						fclose($fd);

-					} else {

-						$data = '';

-					}

-					$mimeMessage->addSubpart($data, $params);

-				} else {

-					$mimeMessage->addSubpart($att['data'], $params);

-				}

-			}

-

-			$output = $mimeMessage->encode();

-			$mimeHeaders = $output['headers'];

-

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

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

-				if (strtolower($k) == 'content-type') {

-					// PHP header() seems to strip leading whitespace starting

-					// the second line, so force everything to one line

-					$this->mimeContentType = str_replace("\r\n", " ", $v);

-				}

-			}

-

-			return $output['body'];

-		}

-

-		return parent::getHTTPBody($soapmsg);

-	}

-

-	/**

-	* gets the HTTP content type for the current response.

-	*

-	* Note: getHTTPBody must be called before this.

-	*

-	* @return string the HTTP content type for the current response.

-	* @access private

-	*/

-	function getHTTPContentType() {

-		if (count($this->responseAttachments) > 0) {

-			return $this->mimeContentType;

-		}

-		return parent::getHTTPContentType();

-	}

-

-	/**

-	* gets the HTTP content type charset for the current response.

-	* returns false for non-text content types.

-	*

-	* Note: getHTTPBody must be called before this.

-	*

-	* @return string the HTTP content type charset for the current response.

-	* @access private

-	*/

-	function getHTTPContentTypeCharset() {

-		if (count($this->responseAttachments) > 0) {

-			return false;

-		}

-		return parent::getHTTPContentTypeCharset();

-	}

-

-	/**

-	* processes SOAP message received from client

-	*

-	* @param	array	$headers	The HTTP headers

-	* @param	string	$data		unprocessed request data from client

-	* @return	mixed	value of the message, decoded into a PHP type

-	* @access   private

-	*/

+    /**

+     * @var array Each array element in the return is an associative array with keys

+     * data, filename, contenttype, cid

+     * @access private

+     */

+    var $requestAttachments = array();

+    /**

+     * @var array Each array element in the return is an associative array with keys

+     * data, filename, contenttype, cid

+     * @access private

+     */

+    var $responseAttachments;

+    /**

+     * @var string

+     * @access private

+     */

+    var $mimeContentType;

+

+    /**

+     * adds a MIME attachment to the current response.

+     *

+     * If the $data parameter contains an empty string, this method will read

+     * the contents of the file named by the $filename parameter.

+     *

+     * If the $cid parameter is false, this method will generate the cid.

+     *

+     * @param string $data The data of the attachment

+     * @param string $filename The filename of the attachment (default is empty string)

+     * @param string $contenttype The MIME Content-Type of the attachment (default is application/octet-stream)

+     * @param string $cid The content-id (cid) of the attachment (default is false)

+     * @return string The content-id (cid) of the attachment

+     * @access public

+     */

+    function addAttachment($data, $filename = '', $contenttype = 'application/octet-stream', $cid = false) {

+        if (! $cid) {

+            $cid = md5(uniqid(time()));

+        }

+

+        $info['data'] = $data;

+        $info['filename'] = $filename;

+        $info['contenttype'] = $contenttype;

+        $info['cid'] = $cid;

+

+        $this->responseAttachments[] = $info;

+

+        return $cid;

+    }

+

+    /**

+     * clears the MIME attachments for the current response.

+     *

+     * @access public

+     */

+    function clearAttachments() {

+        $this->responseAttachments = array();

+    }

+

+    /**

+     * gets the MIME attachments from the current request.

+     *

+     * Each array element in the return is an associative array with keys

+     * data, filename, contenttype, cid.  These keys correspond to the parameters

+     * for addAttachment.

+     *

+     * @return array The attachments.

+     * @access public

+     */

+    function getAttachments() {

+        return $this->requestAttachments;

+    }

+

+    /**

+     * gets the HTTP body for the current response.

+     *

+     * @param string $soapmsg The SOAP payload

+     * @return string The HTTP body, which includes the SOAP payload

+     * @access private

+     */

+    function getHTTPBody($soapmsg) {

+        if (count($this->responseAttachments) > 0) {

+            $params['content_type'] = 'multipart/related; type="text/xml"';

+            $mimeMessage = new Mail_mimePart('', $params);

+            unset($params);

+

+            $params['content_type'] = 'text/xml';

+            $params['encoding']     = '8bit';

+            $params['charset']      = $this->soap_defencoding;

+            $mimeMessage->addSubpart($soapmsg, $params);

+

+            foreach ($this->responseAttachments as $att) {

+                unset($params);

+

+                $params['content_type'] = $att['contenttype'];

+                $params['encoding']     = 'base64';

+                $params['disposition']  = 'attachment';

+                $params['dfilename']    = $att['filename'];

+                $params['cid']          = $att['cid'];

+

+                if ($att['data'] == '' && $att['filename'] <> '') {

+                    if ($fd = fopen($att['filename'], 'rb')) {

+                        $data = fread($fd, filesize($att['filename']));

+                        fclose($fd);

+                    } else {

+                        $data = '';

+                    }

+                    $mimeMessage->addSubpart($data, $params);

+                } else {

+                    $mimeMessage->addSubpart($att['data'], $params);

+                }

+            }

+

+            $output = $mimeMessage->encode();

+            $mimeHeaders = $output['headers'];

+

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

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

+                if (strtolower($k) == 'content-type') {

+                    // PHP header() seems to strip leading whitespace starting

+                    // the second line, so force everything to one line

+                    $this->mimeContentType = str_replace("\r\n", " ", $v);

+                }

+            }

+

+            return $output['body'];

+        }

+

+        return parent::getHTTPBody($soapmsg);

+    }

+

+    /**

+     * gets the HTTP content type for the current response.

+     *

+     * Note: getHTTPBody must be called before this.

+     *

+     * @return string the HTTP content type for the current response.

+     * @access private

+     */

+    function getHTTPContentType() {

+        if (count($this->responseAttachments) > 0) {

+            return $this->mimeContentType;

+        }

+        return parent::getHTTPContentType();

+    }

+

+    /**

+     * gets the HTTP content type charset for the current response.

+     * returns false for non-text content types.

+     *

+     * Note: getHTTPBody must be called before this.

+     *

+     * @return string the HTTP content type charset for the current response.

+     * @access private

+     */

+    function getHTTPContentTypeCharset() {

+        if (count($this->responseAttachments) > 0) {

+            return false;

+        }

+        return parent::getHTTPContentTypeCharset();

+    }

+

+    /**

+     * processes SOAP message received from client

+     *

+     * @param	array	$headers	The HTTP headers

+     * @param	string	$data		unprocessed request data from client

+     * @return	mixed	value of the message, decoded into a PHP type

+     * @access   private

+     */

     function parseRequest($headers, $data) {

-		$this->debug('Entering parseRequest() for payload of length ' . strlen($data) . ' and type of ' . $headers['content-type']);

-		$this->requestAttachments = array();

-		if (strstr($headers['content-type'], 'multipart/related')) {

-			$this->debug('Decode multipart/related');

-			$input = '';

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

-				$input .= "$k: $v\r\n";

-			}

-			$params['input'] = $input . "\r\n" . $data;

-			$params['include_bodies'] = true;

-			$params['decode_bodies'] = true;

-			$params['decode_headers'] = true;

-

-			$structure = Mail_mimeDecode::decode($params);

-

-			foreach ($structure->parts as $part) {

-				if (!isset($part->disposition) && (strstr($part->headers['content-type'], 'text/xml'))) {

-					$this->debug('Have root part of type ' . $part->headers['content-type']);

-					$return = parent::parseRequest($part->headers, $part->body);

-				} else {

-					$this->debug('Have an attachment of type ' . $part->headers['content-type']);

-					$info['data'] = $part->body;

-					$info['filename'] = isset($part->d_parameters['filename']) ? $part->d_parameters['filename'] : '';

-					$info['contenttype'] = $part->headers['content-type'];

-					$info['cid'] = $part->headers['content-id'];

-					$this->requestAttachments[] = $info;

-				}

-			}

-

-			if (isset($return)) {

-				return $return;

-			}

-

-			$this->setError('No root part found in multipart/related content');

-			return;

-		}

-		$this->debug('Not multipart/related');

-		return parent::parseRequest($headers, $data);

-	}

+        $this->debug('Entering parseRequest() for payload of length ' . strlen($data) . ' and type of ' . $headers['content-type']);

+        $this->requestAttachments = array();

+        if (strstr($headers['content-type'], 'multipart/related')) {

+            $this->debug('Decode multipart/related');

+            $input = '';

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

+                $input .= "$k: $v\r\n";

+            }

+            $params['input'] = $input . "\r\n" . $data;

+            $params['include_bodies'] = true;

+            $params['decode_bodies'] = true;

+            $params['decode_headers'] = true;

+

+            $structure = Mail_mimeDecode::decode($params);

+

+            foreach ($structure->parts as $part) {

+                if (!isset($part->disposition) && (strstr($part->headers['content-type'], 'text/xml'))) {

+                    $this->debug('Have root part of type ' . $part->headers['content-type']);

+                    $return = parent::parseRequest($part->headers, $part->body);

+                } else {

+                    $this->debug('Have an attachment of type ' . $part->headers['content-type']);

+                    $info['data'] = $part->body;

+                    $info['filename'] = isset($part->d_parameters['filename']) ? $part->d_parameters['filename'] : '';

+                    $info['contenttype'] = $part->headers['content-type'];

+                    $info['cid'] = $part->headers['content-id'];

+                    $this->requestAttachments[] = $info;

+                }

+            }

+

+            if (isset($return)) {

+                return $return;

+            }

+

+            $this->setError('No root part found in multipart/related content');

+            return;

+        }

+        $this->debug('Not multipart/related');

+        return parent::parseRequest($headers, $data);

+    }

 }

 

 /*

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

Braces +3 added lines, -2 removed lines

@@ -78,8 +78,9 @@
 		$this->proxypassword = $proxypassword;

 		$this->timeout = $timeout;

 		$this->response_timeout = $response_timeout;

-		if (is_array($curl_options))

-			$this->curl_options = $curl_options;

+		if (is_array($curl_options)) {
+					$this->curl_options = $curl_options;
+		}
 		$this->use_curl = $use_curl;

 		$this->fetchWSDL($wsdl);

     }

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;

+    }

 }

 

 ?>

Spacing +205 added lines, -207 removed lines

@@ -45,13 +45,13 @@ 
 	var $proxypassword = '';

 	var $timeout = 0;

 	var $response_timeout = 30;

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

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

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

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

 	// for HTTP authentication

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

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

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

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

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

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

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

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

 

     /**

      * constructor

@@ -67,7 +67,7 @@ 
 	 * @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){

+    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");

         $this->proxyhost = $proxyhost;

@@ -103,19 +103,19 @@ 
     		// Schema imports

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

     			foreach ($list as $xs) {

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

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

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

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

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

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

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

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

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

 									}

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

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

 					                	$this->parseWSDL($url);

 				                		$imported++;

 				                		$imported_urls[] = $url;

@@ -129,19 +129,19 @@ 
     			}

     		}

     		// WSDL imports

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

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

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

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

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

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

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

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

 						if ($url != '') {

 							$urlparts = parse_url($url);

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

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

-										substr($wsdlparts['path'],0,strrpos($wsdlparts['path'],'/') + 1) .$urlparts['path'];

+								$url = $wsdlparts['scheme'].'://'.$wsdlparts['host'].(isset($wsdlparts['port']) ? ':'.$wsdlparts['port'] : '').

+										substr($wsdlparts['path'], 0, strrpos($wsdlparts['path'], '/') + 1).$urlparts['path'];

 							}

-							if (! in_array($url, $imported_urls)) {

+							if (!in_array($url, $imported_urls)) {

 			                	$this->parseWSDL($url);

 		                		$imported++;

 		                		$imported_urls[] = $url;

@@ -154,30 +154,28 @@ 
             }

 		}

         // add new data to operation data

-        foreach($this->bindings as $binding => $bindingData) {

+        foreach ($this->bindings as $binding => $bindingData) {

             if (isset($bindingData['operations']) && is_array($bindingData['operations'])) {

-                foreach($bindingData['operations'] as $operation => $data) {

-                    $this->debug('post-parse data gathering for ' . $operation);

+                foreach ($bindingData['operations'] as $operation => $data) {

+                    $this->debug('post-parse data gathering for '.$operation);

                     $this->bindings[$binding]['operations'][$operation]['input'] =

 						isset($this->bindings[$binding]['operations'][$operation]['input']) ?

-						array_merge($this->bindings[$binding]['operations'][$operation]['input'], $this->portTypes[ $bindingData['portType'] ][$operation]['input']) :

-						$this->portTypes[ $bindingData['portType'] ][$operation]['input'];

+						array_merge($this->bindings[$binding]['operations'][$operation]['input'], $this->portTypes[$bindingData['portType']][$operation]['input']) : $this->portTypes[$bindingData['portType']][$operation]['input'];

                     $this->bindings[$binding]['operations'][$operation]['output'] =

 						isset($this->bindings[$binding]['operations'][$operation]['output']) ?

-						array_merge($this->bindings[$binding]['operations'][$operation]['output'], $this->portTypes[ $bindingData['portType'] ][$operation]['output']) :

-						$this->portTypes[ $bindingData['portType'] ][$operation]['output'];

-                    if(isset($this->messages[ $this->bindings[$binding]['operations'][$operation]['input']['message'] ])){

-						$this->bindings[$binding]['operations'][$operation]['input']['parts'] = $this->messages[ $this->bindings[$binding]['operations'][$operation]['input']['message'] ];

+						array_merge($this->bindings[$binding]['operations'][$operation]['output'], $this->portTypes[$bindingData['portType']][$operation]['output']) : $this->portTypes[$bindingData['portType']][$operation]['output'];

+                    if (isset($this->messages[$this->bindings[$binding]['operations'][$operation]['input']['message']])) {

+						$this->bindings[$binding]['operations'][$operation]['input']['parts'] = $this->messages[$this->bindings[$binding]['operations'][$operation]['input']['message']];

 					}

-					if(isset($this->messages[ $this->bindings[$binding]['operations'][$operation]['output']['message'] ])){

-                   		$this->bindings[$binding]['operations'][$operation]['output']['parts'] = $this->messages[ $this->bindings[$binding]['operations'][$operation]['output']['message'] ];

+					if (isset($this->messages[$this->bindings[$binding]['operations'][$operation]['output']['message']])) {

+                   		$this->bindings[$binding]['operations'][$operation]['output']['parts'] = $this->messages[$this->bindings[$binding]['operations'][$operation]['output']['message']];

                     }

                     // Set operation style if necessary, but do not override one already provided

 					if (isset($bindingData['style']) && !isset($this->bindings[$binding]['operations'][$operation]['style'])) {

                         $this->bindings[$binding]['operations'][$operation]['style'] = $bindingData['style'];

                     }

                     $this->bindings[$binding]['operations'][$operation]['transport'] = isset($bindingData['transport']) ? $bindingData['transport'] : '';

-                    $this->bindings[$binding]['operations'][$operation]['documentation'] = isset($this->portTypes[ $bindingData['portType'] ][$operation]['documentation']) ? $this->portTypes[ $bindingData['portType'] ][$operation]['documentation'] : '';

+                    $this->bindings[$binding]['operations'][$operation]['documentation'] = isset($this->portTypes[$bindingData['portType']][$operation]['documentation']) ? $this->portTypes[$bindingData['portType']][$operation]['documentation'] : '';

                     $this->bindings[$binding]['operations'][$operation]['endpoint'] = isset($bindingData['endpoint']) ? $bindingData['endpoint'] : '';

                 }

             }

@@ -203,13 +201,13 @@ 
         $wsdl_props = parse_url($wsdl);

 

         if (isset($wsdl_props['scheme']) && ($wsdl_props['scheme'] == 'http' || $wsdl_props['scheme'] == 'https')) {

-            $this->debug('getting WSDL http(s) URL ' . $wsdl);

+            $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->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);

@@ -220,8 +218,8 @@ 
 			//$this->debug("WSDL response\n" . $tr->incoming_payload);

 			$this->appendDebug($tr->getDebug());

 			// catch errors

-			if($err = $tr->getError() ){

-				$errstr = 'Getting ' . $wsdl . ' - HTTP ERROR: '.$err;

+			if ($err = $tr->getError()) {

+				$errstr = 'Getting '.$wsdl.' - HTTP ERROR: '.$err;

 				$this->debug($errstr);

 	            $this->setError($errstr);

 				unset($tr);

@@ -232,11 +230,11 @@ 
         } 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'];

+        		$path = isset($wsdl_props['host']) ? ($wsdl_props['host'].':'.$wsdl_props['path']) : $wsdl_props['path'];

         	} else {

         		$path = $wsdl;

         	}

-            $this->debug('getting WSDL file ' . $path);

+            $this->debug('getting WSDL file '.$path);

             if ($fp = @fopen($path, 'r')) {

                 $wsdl_string = '';

                 while ($data = fread($fp, 32768)) {

@@ -272,7 +270,7 @@ 
                 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;

         }

@@ -280,7 +278,7 @@ 
         xml_parser_free($this->parser);

         $this->debug('Parsing WSDL done');

 		// catch wsdl parse errors

-		if($this->getError()){

+		if ($this->getError()) {

 			return false;

 		}

         return true;

@@ -318,21 +316,21 @@ 
             // process attributes

             if (count($attrs) > 0) {

 				// register namespace declarations

-                foreach($attrs as $k => $v) {

-                    if (preg_match('/^xmlns/',$k)) {

+                foreach ($attrs as $k => $v) {

+                    if (preg_match('/^xmlns/', $k)) {

                         if ($ns_prefix = substr(strrchr($k, ':'), 1)) {

                             $this->namespaces[$ns_prefix] = $v;

                         } else {

-                            $this->namespaces['ns' . (count($this->namespaces) + 1)] = $v;

+                            $this->namespaces['ns'.(count($this->namespaces) + 1)] = $v;

                         }

                         if ($v == 'http://www.w3.org/2001/XMLSchema' || $v == 'http://www.w3.org/1999/XMLSchema' || $v == 'http://www.w3.org/2000/10/XMLSchema') {

                             $this->XMLSchemaVersion = $v;

-                            $this->namespaces['xsi'] = $v . '-instance';

+                            $this->namespaces['xsi'] = $v.'-instance';

                         }

                     }

                 }

                 // expand each attribute prefix to its namespace

-                foreach($attrs as $k => $v) {

+                foreach ($attrs as $k => $v) {

                     $k = strpos($k, ':') ? $this->expandQname($k) : $k;

                     if ($k != 'location' && $k != 'soapAction' && $k != 'namespace') {

                         $v = strpos($v, ':') ? $this->expandQname($v) : $v;

@@ -358,12 +356,12 @@ 
                 case 'message':

                     if ($name == 'part') {

 			            if (isset($attrs['type'])) {

-		                    $this->debug("msg " . $this->currentMessage . ": found part (with type) $attrs[name]: " . implode(',', $attrs));

+		                    $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'] . '^';

+		                    $this->debug("msg ".$this->currentMessage.": found part (with element) $attrs[name]: ".implode(',', $attrs));

+			                $this->messages[$this->currentMessage][$attrs['name']] = $attrs['element'].'^';

 			            }

         			}

         			break;

@@ -432,15 +430,15 @@ 
 					switch ($name) {

 					    case 'port':

 					        $this->currentPort = $attrs['name'];

-					        $this->debug('current port: ' . $this->currentPort);

+					        $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'];

+					        $this->bindings[$this->ports[$this->currentPort]['binding']]['bindingType'] = $namespace;

+					        $this->bindings[$this->ports[$this->currentPort]['binding']]['endpoint'] = $attrs['location'];

 					        break;

 					}

 					break;

@@ -450,13 +448,13 @@ 
 			case 'import':

 			    if (isset($attrs['location'])) {

                     $this->import[$attrs['namespace']][] = array('location' => $attrs['location'], 'loaded' => false);

-                    $this->debug('parsing import ' . $attrs['namespace']. ' - ' . $attrs['location'] . ' (' . count($this->import[$attrs['namespace']]).')');

+                    $this->debug('parsing import '.$attrs['namespace'].' - '.$attrs['location'].' ('.count($this->import[$attrs['namespace']]).')');

 				} else {

                     $this->import[$attrs['namespace']][] = array('location' => '', 'loaded' => true);

-					if (! $this->getPrefixFromNamespace($attrs['namespace'])) {

-						$this->namespaces['ns'.(count($this->namespaces)+1)] = $attrs['namespace'];

+					if (!$this->getPrefixFromNamespace($attrs['namespace'])) {

+						$this->namespaces['ns'.(count($this->namespaces) + 1)] = $attrs['namespace'];

 					}

-                    $this->debug('parsing import ' . $attrs['namespace']. ' - [no location] (' . count($this->import[$attrs['namespace']]).')');

+                    $this->debug('parsing import '.$attrs['namespace'].' - [no location] ('.count($this->import[$attrs['namespace']]).')');

 				}

 				break;

 			//wait for schema

@@ -483,13 +481,13 @@ 
 					}

 					$this->status = 'binding';

 					$this->bindings[$this->currentBinding]['portType'] = $this->getLocalPart($attrs['type']);

-					$this->debug("current binding: $this->currentBinding of portType: " . $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);

+				$this->debug('current service: '.$this->serviceName);

 				break;

 			case 'definitions':

 				foreach ($attrs as $name => $value) {

@@ -507,7 +505,7 @@ 
 	* @param string $name element name

 	* @access private

 	*/

-	function end_element($parser, $name){

+	function end_element($parser, $name) {

 		// unset schema status

 		if (/*preg_match('/types$/', $name) ||*/ preg_match('/schema$/', $name)) {

 			$this->status = "";

@@ -592,8 +590,8 @@ 
 		}

 		$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']);

+		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) {

@@ -601,8 +599,8 @@ 
 					//$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 (isset($this->bindings[$portData['binding']]['operations'])) {

+						$ops = array_merge($ops, $this->bindings[$portData['binding']]['operations']);

 					}

 				}

 			}

@@ -629,15 +627,15 @@ 
 			$bindingType = 'http://schemas.xmlsoap.org/wsdl/soap12/';

 		}

 		// loop thru ports

-		foreach($this->ports as $port => $portData) {

+		foreach ($this->ports as $port => $portData) {

 			// binding type of port matches parameter

 			if ($portData['bindingType'] == $bindingType) {

 				// get binding

 				//foreach($this->bindings[ $portData['binding'] ]['operations'] as $bOperation => $opData) {

-				foreach(array_keys($this->bindings[ $portData['binding'] ]['operations']) as $bOperation) {

+				foreach (array_keys($this->bindings[$portData['binding']]['operations']) as $bOperation) {

 					// note that we could/should also check the namespace here

 					if ($operation == $bOperation) {

-						$opData = $this->bindings[ $portData['binding'] ]['operations'][$operation];

+						$opData = $this->bindings[$portData['binding']]['operations'][$operation];

 					    return $opData;

 					}

 				}

@@ -660,11 +658,11 @@ 
 			$bindingType = 'http://schemas.xmlsoap.org/wsdl/soap12/';

 		}

 		// loop thru ports

-		foreach($this->ports as $port => $portData) {

+		foreach ($this->ports as $port => $portData) {

 			// binding type of port matches parameter

 			if ($portData['bindingType'] == $bindingType) {

 				// loop through operations for the binding

-				foreach ($this->bindings[ $portData['binding'] ]['operations'] as $bOperation => $opData) {

+				foreach ($this->bindings[$portData['binding']]['operations'] as $bOperation => $opData) {

 					if ($opData['soapAction'] == $soapAction) {

 					    return $opData;

 					}

@@ -693,7 +691,7 @@ 
     */

 	function getTypeDef($type, $ns) {

 		$this->debug("in getTypeDef: type=$type, ns=$ns");

-		if ((! $ns) && isset($this->namespaces['tns'])) {

+		if ((!$ns) && isset($this->namespaces['tns'])) {

 			$ns = $this->namespaces['tns'];

 			$this->debug("in getTypeDef: type namespace forced to $ns");

 		}

@@ -751,7 +749,7 @@ 
     *

     * @access private

     */

-    function webDescription(){

+    function webDescription() {

     	global $HTTP_SERVER_VARS;

 

 		if (isset($_SERVER)) {

@@ -845,19 +843,19 @@ 
 				<p>View the <a href="'.$PHP_SELF.'?wsdl">WSDL</a> for the service.

 				Click on an operation name to view it&apos;s details.</p>

 				<ul>';

-				foreach($this->getOperations() as $op => $data){

+				foreach ($this->getOperations() as $op => $data) {

 				    $b .= "<li><a href='#' onclick=\"popout();popup('$op')\">$op</a></li>";

 				    // create hidden div

 				    $b .= "<div id='$op' class='hidden'>

 				    <a href='#' onclick='popout()'><font color='#ffffff'>Close</font></a><br><br>";

-				    foreach($data as $donnie => $marie){ // loop through opdata

-						if($donnie == 'input' || $donnie == 'output'){ // show input/output data

+				    foreach ($data as $donnie => $marie) { // loop through opdata

+						if ($donnie == 'input' || $donnie == 'output') { // show input/output data

 						    $b .= "<font color='white'>".ucfirst($donnie).':</font><br>';

-						    foreach($marie as $captain => $tenille){ // loop through data

-								if($captain == 'parts'){ // loop thru parts

+						    foreach ($marie as $captain => $tenille) { // loop through data

+								if ($captain == 'parts') { // loop thru parts

 								    $b .= "&nbsp;&nbsp;$captain:<br>";

 					                //if(is_array($tenille)){

-								    	foreach($tenille as $joanie => $chachi){

+								    	foreach ($tenille as $joanie => $chachi) {

 											$b .= "&nbsp;&nbsp;&nbsp;&nbsp;$joanie: $chachi<br>";

 								    	}

 					        		//}

@@ -889,31 +887,31 @@ 
 	{

 		$xml = '<?xml version="1.0" encoding="ISO-8859-1"?>';

 		$xml .= "\n<definitions";

-		foreach($this->namespaces as $k => $v) {

+		foreach ($this->namespaces as $k => $v) {

 			$xml .= " xmlns:$k=\"$v\"";

 		}

 		// 10.9.02 - add poulter fix for wsdl and tns declarations

 		if (isset($this->namespaces['wsdl'])) {

-			$xml .= " xmlns=\"" . $this->namespaces['wsdl'] . "\"";

+			$xml .= " xmlns=\"".$this->namespaces['wsdl']."\"";

 		}

 		if (isset($this->namespaces['tns'])) {

-			$xml .= " targetNamespace=\"" . $this->namespaces['tns'] . "\"";

+			$xml .= " targetNamespace=\"".$this->namespaces['tns']."\"";

 		}

 		$xml .= '>';

 		// imports

 		if (sizeof($this->import) > 0) {

-			foreach($this->import as $ns => $list) {

+			foreach ($this->import as $ns => $list) {

 				foreach ($list as $ii) {

 					if ($ii['location'] != '') {

-						$xml .= '<import location="' . $ii['location'] . '" namespace="' . $ns . '" />';

+						$xml .= '<import location="'.$ii['location'].'" namespace="'.$ns.'" />';

 					} else {

-						$xml .= '<import namespace="' . $ns . '" />';

+						$xml .= '<import namespace="'.$ns.'" />';

 					}

 				}

 			}

 		}

 		// types

-		if (count($this->schemas)>=1) {

+		if (count($this->schemas) >= 1) {

 			$xml .= "\n<types>\n";

 			foreach ($this->schemas as $ns => $list) {

 				foreach ($list as $xs) {

@@ -924,10 +922,10 @@ 
 		}

 		// 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) {

+			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));

@@ -935,7 +933,7 @@ 
 						    // print 'checking typemap: '.$this->XMLSchemaVersion.'<br>';

 						    $typePrefix = 'xsd';

 						} else {

-						    foreach($this->typemap as $ns => $types) {

+						    foreach ($this->typemap as $ns => $types) {

 						        if (isset($types[$partType])) {

 						            $typePrefix = $this->getPrefixFromNamespace($ns);

 						        }

@@ -955,7 +953,7 @@ 
 						} else {

 							$elementortype = 'type';

 						}

-						$xml .= "\n" . '  <part name="' . $partName . '" ' . $elementortype . '="' . $typePrefix . ':' . $localPart . '" />';

+						$xml .= "\n".'  <part name="'.$partName.'" '.$elementortype.'="'.$typePrefix.':'.$localPart.'" />';

 					}

 				}

 				$xml .= '</message>';

@@ -965,54 +963,54 @@ 
 		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'] . '"/>';

+			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'] . '"';

+						$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>';

+					$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'] . '"';

+						$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'] . '"';

+					$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 .= ' parameterOrder="'.$opParts['parameterOrder'].'"';

 					}

 					$portType_xml .= '>';

-					if(isset($opParts['documentation']) && $opParts['documentation'] != '') {

-						$portType_xml .= "\n" . '    <documentation>' . htmlspecialchars($opParts['documentation']) . '</documentation>';

+					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".'    <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>';

+				$portType_xml .= "\n".'</portType>';

+				$binding_xml .= "\n".'</binding>';

 			}

-			$xml .= $portType_xml . $binding_xml;

+			$xml .= $portType_xml.$binding_xml;

 		}

 		// services

-		$xml .= "\n<service name=\"" . $this->serviceName . '">';

+		$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>';

+			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>";

+		$xml .= "\n".'</service>';

+		return $xml."\n</definitions>";

 	}

 

 	/**

@@ -1109,7 +1107,7 @@ 
 	 */

 	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));

+		$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"');

@@ -1117,8 +1115,8 @@ 
 			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);

+			$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:');

@@ -1126,7 +1124,7 @@ 
 

 		// Get encoding style for output and set to current

 		$encodingStyle = 'http://schemas.xmlsoap.org/soap/encoding/';

-		if(($direction == 'input') && isset($opData['output']['encodingStyle']) && ($opData['output']['encodingStyle'] != $encodingStyle)) {

+		if (($direction == 'input') && isset($opData['output']['encodingStyle']) && ($opData['output']['encodingStyle'] != $encodingStyle)) {

 			$encodingStyle = $opData['output']['encodingStyle'];

 			$enc_style = $encodingStyle;

 		}

@@ -1211,7 +1209,7 @@ 
 	function serializeParameters($operation, $direction, $parameters)

 	{

 		$this->debug("in serializeParameters: operation=$operation, direction=$direction, XMLSchemaVersion=$this->XMLSchemaVersion");

-		$this->appendDebug('parameters=' . $this->varDump($parameters));

+		$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"');

@@ -1219,8 +1217,8 @@ 
 			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);

+			$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:');

@@ -1228,7 +1226,7 @@ 
 

 		// Get encoding style for output and set to current

 		$encodingStyle = 'http://schemas.xmlsoap.org/soap/encoding/';

-		if(($direction == 'input') && isset($opData['output']['encodingStyle']) && ($opData['output']['encodingStyle'] != $encodingStyle)) {

+		if (($direction == 'input') && isset($opData['output']['encodingStyle']) && ($opData['output']['encodingStyle'] != $encodingStyle)) {

 			$encodingStyle = $opData['output']['encodingStyle'];

 			$enc_style = $encodingStyle;

 		}

@@ -1239,14 +1237,14 @@ 
 

 			$use = $opData[$direction]['use'];

 			$this->debug("use=$use");

-			$this->debug('got ' . count($opData[$direction]['parts']) . ' part(s)');

+			$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('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']) {

+					if (isset($opData[$direction]['encodingStyle']) && $encodingStyle != $opData[$direction]['encodingStyle']) {

 						$encodingStyle = $opData[$direction]['encodingStyle'];

 						$enc_style = $encodingStyle;

 					} else {

@@ -1287,18 +1285,18 @@ 
 	 * @return string value serialized as an XML string

 	 * @access private

 	 */

-	function serializeType($name, $type, $value, $use='encoded', $encodingStyle=false, $unqualified=false)

+	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 . '"';

+		$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;

+    			$type = $value->type_ns.':'.$value->type;

 		    	$forceType = true;

 		    	$this->debug("in serializeType: soapval overrides type to $type");

     		} elseif ($value->type) {

@@ -1317,7 +1315,7 @@ 
 	    			$value['!'] = $value;

 	    		}

 	    		foreach ($attrs as $n => $v) {

-	    			$value['!' . $n] = $v;

+	    			$value['!'.$n] = $v;

 	    		}

 		    	$this->debug("in serializeType: soapval provides attributes");

 		    }

@@ -1335,7 +1333,7 @@ 
 				$this->debug("in serializeType: expanded prefixed type: $uqType, $ns");

 			}

 

-			if($ns == $this->XMLSchemaVersion || $ns == 'http://schemas.xmlsoap.org/soap/encoding/'){

+			if ($ns == $this->XMLSchemaVersion || $ns == 'http://schemas.xmlsoap.org/soap/encoding/') {

 				$this->debug('in serializeType: type namespace indicates XML Schema or SOAP Encoding type');

 				if ($unqualified && $use == 'literal') {

 					$elementNS = " xmlns=\"\"";

@@ -1348,7 +1346,7 @@ 
 						$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\"/>";

+						$xml = "<$name$elementNS xsi:nil=\"true\" xsi:type=\"".$this->getPrefixFromNamespace($ns).":$uqType\"/>";

 					}

 					$this->debug("in serializeType: returning: $xml");

 					return $xml;

@@ -1358,7 +1356,7 @@ 
 					return $this->serialize_val($value, $name, false, false, false, false, $use);

 				}

 		    	if ($uqType == 'boolean') {

-		    		if ((is_string($value) && $value == 'false') || (! $value)) {

+		    		if ((is_string($value) && $value == 'false') || (!$value)) {

 						$value = 'false';

 					} else {

 						$value = 'true';

@@ -1376,12 +1374,12 @@ 
 				if (!$this->getTypeDef($uqType, $ns)) {

 					if ($use == 'literal') {

 						if ($forceType) {

-							$xml = "<$name$elementNS xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\">$value</$name>";

+							$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>";

+						$xml = "<$name$elementNS xsi:type=\"".$this->getPrefixFromNamespace($ns).":$uqType\"$encodingStyle>$value</$name>";

 					}

 					$this->debug("in serializeType: returning: $xml");

 					return $xml;

@@ -1391,29 +1389,29 @@ 
 				$this->debug('in serializeType: appears to be Apache SOAP type');

 				if ($uqType == 'Map') {

 					$tt_prefix = $this->getPrefixFromNamespace('http://xml.apache.org/xml-soap');

-					if (! $tt_prefix) {

+					if (!$tt_prefix) {

 						$this->debug('in serializeType: Add namespace for Apache SOAP type');

-						$tt_prefix = 'ns' . rand(1000, 9999);

+						$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) {

+					foreach ($value as $k => $v) {

 						$this->debug("serializing map element: key $k, value $v");

 						$contents .= '<item>';

-						$contents .= $this->serialize_val($k,'key',false,false,false,false,$use);

-						$contents .= $this->serialize_val($v,'value',false,false,false,false,$use);

+						$contents .= $this->serialize_val($k, 'key', false, false, false, false, $use);

+						$contents .= $this->serialize_val($v, 'value', false, false, false, false, $use);

 						$contents .= '</item>';

 					}

 					if ($use == 'literal') {

 						if ($forceType) {

-							$xml = "<$name xsi:type=\"" . $tt_prefix . ":$uqType\">$contents</$name>";

+							$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>";

+						$xml = "<$name xsi:type=\"".$tt_prefix.":$uqType\"$encodingStyle>$contents</$name>";

 					}

 					$this->debug("in serializeType: returning: $xml");

 					return $xml;

@@ -1427,13 +1425,13 @@ 
 			$ns = '';

 			$uqType = $type;

 		}

-		if(!$typeDef = $this->getTypeDef($uqType, $ns)){

+		if (!$typeDef = $this->getTypeDef($uqType, $ns)) {

 			$this->setError("$type ($uqType) is not a supported type.");

 			$this->debug("in serializeType: $type ($uqType) is not a supported type.");

 			return false;

 		} else {

 			$this->debug("in serializeType: found typeDef");

-			$this->appendDebug('typeDef=' . $this->varDump($typeDef));

+			$this->appendDebug('typeDef='.$this->varDump($typeDef));

 			if (substr($uqType, -1) == '^') {

 				$uqType = substr($uqType, 0, -1);

 			}

@@ -1444,7 +1442,7 @@ 
 			return false;

 		}

 		$phpType = $typeDef['phpType'];

-		$this->debug("in serializeType: uqType: $uqType, ns: $ns, phptype: $phpType, arrayType: " . (isset($typeDef['arrayType']) ? $typeDef['arrayType'] : '') );

+		$this->debug("in serializeType: uqType: $uqType, ns: $ns, phptype: $phpType, arrayType: ".(isset($typeDef['arrayType']) ? $typeDef['arrayType'] : ''));

 		// if php type == struct, map value to the <all> element names

 		if ($phpType == 'struct') {

 			if (isset($typeDef['typeClass']) && $typeDef['typeClass'] == 'element') {

@@ -1467,7 +1465,7 @@ 
 					// TODO: depends on minOccurs and nillable

 					$xml = "<$elementName$elementNS/>";

 				} else {

-					$xml = "<$elementName$elementNS xsi:nil=\"true\" xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\"/>";

+					$xml = "<$elementName$elementNS xsi:nil=\"true\" xsi:type=\"".$this->getPrefixFromNamespace($ns).":$uqType\"/>";

 				}

 				$this->debug("in serializeType: returning: $xml");

 				return $xml;

@@ -1479,12 +1477,12 @@ 
 				$elementAttrs = $this->serializeComplexTypeAttributes($typeDef, $value, $ns, $uqType);

 				if ($use == 'literal') {

 					if ($forceType) {

-						$xml = "<$elementName$elementNS$elementAttrs xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\">";

+						$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>";

+					$xml = "<$elementName$elementNS$elementAttrs xsi:type=\"".$this->getPrefixFromNamespace($ns).":$uqType\"$encodingStyle>";

 				}

 

 				if (isset($typeDef['simpleContent']) && $typeDef['simpleContent'] == 'true') {

@@ -1519,13 +1517,13 @@ 
 					// 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'])) .

-						':' .

+					$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");

@@ -1533,8 +1531,8 @@ 
 			}

 			if (isset($typeDef['multidimensional'])) {

 				$nv = array();

-				foreach($value as $v) {

-					$cols = ',' . sizeof($v);

+				foreach ($value as $v) {

+					$cols = ','.sizeof($v);

 					$nv = array_merge($nv, $v);

 				}

 				$value = $nv;

@@ -1544,10 +1542,10 @@ 
 			if (is_array($value) && sizeof($value) >= 1) {

 				$rows = sizeof($value);

 				$contents = '';

-				foreach($value as $k => $v) {

+				foreach ($value as $k => $v) {

 					//$this->debug("serializing array element: $k, $v of type: $typeDef[arrayType]");

 					//if (strpos($typeDef['arrayType'], ':') ) {

-					if (!in_array($typeDef['arrayType'],$this->typemap['http://www.w3.org/2001/XMLSchema'])) {

+					if (!in_array($typeDef['arrayType'], $this->typemap['http://www.w3.org/2001/XMLSchema'])) {

 					    $contents .= $this->serializeType('item', $typeDef['arrayType'], $v, $use);

 					} else {

 					    $contents .= $this->serialize_val($v, 'item', $typeDef['arrayType'], null, $this->XMLSchemaVersion, false, $use);

@@ -1584,12 +1582,12 @@ 
 			}

 			if ($use == 'literal') {

 				if ($forceType) {

-					$xml = "<$name$elementNS xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\">$value</$name>";

+					$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>";

+				$xml = "<$name$elementNS xsi:type=\"".$this->getPrefixFromNamespace($ns).":$uqType\"$encodingStyle>$value</$name>";

 			}

 		}

 		$this->debug("in serializeType: returning: $xml");

@@ -1633,22 +1631,22 @@ 
 				$xvalue = array();

 			}

 			foreach ($typeDef['attrs'] as $aName => $attrs) {

-				if (isset($xvalue['!' . $aName])) {

-					$xname = '!' . $aName;

+				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;

+					$xname = '!'.$aName;

 					$xvalue[$xname] = $attrs['default'];

-					$this->debug('use default value of ' . $xvalue[$aName] . ' for attribute ' . $aName);

+					$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]) . "\"";

+					$xml .= " $aName=\"".$this->expandEntities($xvalue[$xname])."\"";

 				}

 			}

 		} else {

@@ -1669,7 +1667,7 @@ 
 	 * @return string value serialized as an XML string

 	 * @access private

 	 */

-	function serializeComplexTypeElements($typeDef, $value, $ns, $uqType, $use='encoded', $encodingStyle=false) {

+	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'])) {

@@ -1696,23 +1694,23 @@ 
 				$xvalue = array();

 			}

 			// toggle whether all elements are present - ideally should validate against schema

-			if (count($typeDef['elements']) != count($xvalue)){

+			if (count($typeDef['elements']) != count($xvalue)) {

 				$optionals = true;

 			}

 			foreach ($typeDef['elements'] as $eName => $attrs) {

 				if (!isset($xvalue[$eName])) {

 					if (isset($attrs['default'])) {

 						$xvalue[$eName] = $attrs['default'];

-						$this->debug('use default value of ' . $xvalue[$eName] . ' for element ' . $eName);

+						$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')

-					){

+					&& ((!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']);

+						$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");

@@ -1777,15 +1775,15 @@ 
 	* @see nusoap_xmlschema

 	* @access public

 	*/

-	function addComplexType($name,$typeClass='complexType',$phpType='array',$compositor='',$restrictionBase='',$elements=array(),$attrs=array(),$arrayType='') {

+	function addComplexType($name, $typeClass = 'complexType', $phpType = 'array', $compositor = '', $restrictionBase = '', $elements = array(), $attrs = array(), $arrayType = '') {

 		if (count($elements) > 0) {

 			$eElements = array();

-	    	foreach($elements as $n => $e){

+	    	foreach ($elements as $n => $e) {

 	            // expand each element

 	            $ee = array();

 	            foreach ($e as $k => $v) {

-		            $k = strpos($k,':') ? $this->expandQname($k) : $k;

-		            $v = strpos($v,':') ? $this->expandQname($v) : $v;

+		            $k = strpos($k, ':') ? $this->expandQname($k) : $k;

+		            $v = strpos($v, ':') ? $this->expandQname($v) : $v;

 		            $ee[$k] = $v;

 		    	}

 	    		$eElements[$n] = $ee;

@@ -1794,11 +1792,11 @@ 
 		}

 

 		if (count($attrs) > 0) {

-	    	foreach($attrs as $n => $a){

+	    	foreach ($attrs as $n => $a) {

 	            // expand each attribute

 	            foreach ($a as $k => $v) {

-		            $k = strpos($k,':') ? $this->expandQname($k) : $k;

-		            $v = strpos($v,':') ? $this->expandQname($v) : $v;

+		            $k = strpos($k, ':') ? $this->expandQname($k) : $k;

+		            $v = strpos($v, ':') ? $this->expandQname($v) : $v;

 		            $aa[$k] = $v;

 		    	}

 	    		$eAttrs[$n] = $aa;

@@ -1806,11 +1804,11 @@ 
 	    	$attrs = $eAttrs;

 		}

 

-		$restrictionBase = strpos($restrictionBase,':') ? $this->expandQname($restrictionBase) : $restrictionBase;

-		$arrayType = strpos($arrayType,':') ? $this->expandQname($arrayType) : $arrayType;

+		$restrictionBase = strpos($restrictionBase, ':') ? $this->expandQname($restrictionBase) : $restrictionBase;

+		$arrayType = strpos($arrayType, ':') ? $this->expandQname($arrayType) : $arrayType;

 

 		$typens = isset($this->namespaces['types']) ? $this->namespaces['types'] : $this->namespaces['tns'];

-		$this->schemas[$typens][0]->addComplexType($name,$typeClass,$phpType,$compositor,$restrictionBase,$elements,$attrs,$arrayType);

+		$this->schemas[$typens][0]->addComplexType($name, $typeClass, $phpType, $compositor, $restrictionBase, $elements, $attrs, $arrayType);

 	}

 

 	/**

@@ -1824,8 +1822,8 @@ 
 	* @see nusoap_xmlschema

 	* @access public

 	*/

-	function addSimpleType($name, $restrictionBase='', $typeClass='simpleType', $phpType='scalar', $enumeration=array()) {

-		$restrictionBase = strpos($restrictionBase,':') ? $this->expandQname($restrictionBase) : $restrictionBase;

+	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);

@@ -1857,7 +1855,7 @@ 
 	* @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 = ''){

+	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/';

 		}

@@ -1867,24 +1865,24 @@ 
 			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 . '^');

+			$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' . '^');

+			$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] =

+		$this->bindings[$this->serviceName.'Binding']['operations'][$name] =

 		array(

 		'name' => $name,

-		'binding' => $this->serviceName . 'Binding',

+		'binding' => $this->serviceName.'Binding',

 		'endpoint' => $this->endpoint,

 		'soapAction' => $soapaction,

 		'style' => $style,

@@ -1892,42 +1890,42 @@ 
 			'use' => $use,

 			'namespace' => $namespace,

 			'encodingStyle' => $encodingStyle,

-			'message' => $name . 'Request',

+			'message' => $name.'Request',

 			'parts' => $in),

 		'output' => array(

 			'use' => $use,

 			'namespace' => $namespace,

 			'encodingStyle' => $encodingStyle,

-			'message' => $name . 'Response',

+			'message' => $name.'Response',

 			'parts' => $out),

 		'namespace' => $namespace,

 		'transport' => 'http://schemas.xmlsoap.org/soap/http',

 		'documentation' => $documentation);

 		// add portTypes

 		// add messages

-		if($in)

+		if ($in)

 		{

-			foreach($in as $pName => $pType)

+			foreach ($in as $pName => $pType)

 			{

-				if(strpos($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';

+            $this->messages[$name.'Request'] = '0';

         }

-		if($out)

+		if ($out)

 		{

-			foreach($out as $pName => $pType)

+			foreach ($out as $pName => $pType)

 			{

-				if(strpos($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';

+            $this->messages[$name.'Response'] = '0';

         }

 		return true;

 	}