chamilo / chamilo-lms

main/inc/lib/groupmanager.lib.php

Doc Comments +13 added lines, -10 removed lines

@@ -369,7 +369,7 @@ 
      * @author Christophe Gesche <christophe.gesche@claroline.net>
      * @author Hugues Peeters <hugues.peeters@claroline.net>
      * @author Bart Mollet
-     * @param  mixed  $groupIdList - group(s) to delete. It can be a single id
+     * @param  mixed  $group_ids - group(s) to delete. It can be a single id
      *                                (int) or a list of id (array).
      * @param string $course_code Default is current course
      * @return integer              - number of groups deleted.
@@ -573,7 +573,7 @@ 
      * @param bool      Whether self registration is allowed or not
      * @param bool      Whether self unregistration is allowed or not
      * @param int       $categoryId
-     * @return bool     TRUE if properties are successfully changed, false otherwise
+     * @return Statement|null     TRUE if properties are successfully changed, false otherwise
      */
     public static function set_group_properties(
         $group_id,
@@ -724,7 +724,7 @@ 
      * @param int $group_id The id of the group
      * @param string $course_code The course in which the group is (default =
      * current course)
-     * @return array The category
+     * @return integer The category
      */
     public static function get_category_from_group($group_id, $course_code = null)
     {
@@ -786,9 +786,9 @@ 
      * Create group category
      * @param string $title The title of the new category
      * @param string $description The description of the new category
-     * @param bool $self_registration_allowed
-     * @param bool $self_unregistration_allowed
-     * @param int $max_number_of_students
+     * @param integer $self_registration_allowed
+     * @param integer $self_unregistration_allowed
+     * @param int $maximum_number_of_students
      * @param int $groups_per_user
      */
     public static function create_category(
@@ -994,6 +994,8 @@ 
      * @param int $limit
      * @param bool $getCount
      * @param int $courseId
+     * @param string $column
+     * @param string $direction
      * @return array list of user id
      */
     public static function get_users(
@@ -1172,7 +1174,7 @@ 
      *         Hugues Peeters     <hugues.peeters@claroline.net> - original version
      * @author Roan Embrechts - virtual course support, code cleaning
      * @author Bart Mollet - code cleaning, use other GroupManager-functions
-     * @return void
+     * @return false|null
      */
     public static function fill_groups($group_ids)
     {
@@ -1625,7 +1627,7 @@ 
      * Unsubscribe user(s) from a specified group in current course
      * @param mixed $user_ids Can be an array with user-id's or a single user-id
      * @param int $group_id
-     * @return bool TRUE if successful
+     * @return boolean|null TRUE if successful
      */
     public static function unsubscribe_users($user_ids, $group_id)
     {
@@ -1644,7 +1646,7 @@ 
 
     /**
      * Unsubscribe all users from one or more groups
-     * @param mixed $group_id Can be an array with group-id's or a single group-id
+     * @param mixed $group_ids Can be an array with group-id's or a single group-id
      * @return bool TRUE if successful
      */
     public static function unsubscribe_all_users($group_ids)
@@ -1676,7 +1678,7 @@ 
 
     /**
      * Unsubscribe all tutors from one or more groups
-     * @param mixed $group_id Can be an array with group-id's or a single group-id
+     * @param mixed $group_ids Can be an array with group-id's or a single group-id
      * @see unsubscribe_all_users. This function is almost an exact copy of that function.
      * @return bool TRUE if successful
      * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
@@ -1861,6 +1863,7 @@ 
      *
      * @param $user_array_in list of users (must be sorted).
      * @param string $compare_field, the field to be compared
+     * @param string $compare_field
      */
     public static function filter_duplicates($user_array_in, $compare_field)
     {

Spacing +39 added lines, -39 removed lines

@@ -211,8 +211,8 @@ 
             $sql = "UPDATE $table_group SET id = iid WHERE iid = $lastId";
             Database::query($sql);
 
-            $desired_dir_name= '/'.api_replace_dangerous_char($name).'_groupdocs';
-            $my_path = api_get_path(SYS_COURSE_PATH) . $currentCourseRepository . '/document';
+            $desired_dir_name = '/'.api_replace_dangerous_char($name).'_groupdocs';
+            $my_path = api_get_path(SYS_COURSE_PATH).$currentCourseRepository.'/document';
 
             $newFolderData = create_unexisting_directory(
                 $_course,
@@ -275,11 +275,11 @@ 
                 $values['default_view_type_group']['default_view_type'] = api_get_setting('default_forum_view');
                 $values['group_forum'] = $lastId;
                 if ($forumState == '1') {
-                    $values['public_private_group_forum_group']['public_private_group_forum']='public';
+                    $values['public_private_group_forum_group']['public_private_group_forum'] = 'public';
                 } elseif ($forumState == '2') {
-                    $values['public_private_group_forum_group']['public_private_group_forum']='private';
+                    $values['public_private_group_forum_group']['public_private_group_forum'] = 'private';
                 } elseif ($forumState == '0') {
-                    $values['public_private_group_forum_group']['public_private_group_forum']='unavailable';
+                    $values['public_private_group_forum_group']['public_private_group_forum'] = 'unavailable';
                 }
                 store_forum($values);
             }
@@ -310,9 +310,9 @@ 
             1
         );
         $users = self::get_users($group_id);
-        $group_ids = array ();
+        $group_ids = array();
 
-        for ($group_nr = 1; $group_nr <= $number_of_groups; $group_nr ++) {
+        for ($group_nr = 1; $group_nr <= $number_of_groups; $group_nr++) {
             $group_ids[] = self::create_group(
                 get_lang('Subgroup').' '.$group_nr,
                 $category_id,
@@ -356,7 +356,7 @@ 
                 0,
                 count($users_ids)
             );
-            self::subscribe_users($users_ids,$group_id);
+            self::subscribe_users($users_ids, $group_id);
             $group_ids[] = $group_id;
         }
         return $group_ids;
@@ -381,14 +381,14 @@ 
         $group_table = Database:: get_course_table(TABLE_GROUP);
         $forum_table = Database:: get_course_table(TABLE_FORUM);
 
-        $group_ids = is_array($group_ids) ? $group_ids : array ($group_ids);
-        $group_ids = array_map('intval',$group_ids);
+        $group_ids = is_array($group_ids) ? $group_ids : array($group_ids);
+        $group_ids = array_map('intval', $group_ids);
 
         if (api_is_course_coach()) {
             //a coach can only delete courses from his session
             for ($i = 0; $i < count($group_ids); $i++) {
-                if (!api_is_element_in_the_session(TOOL_GROUP,$group_ids[$i])) {
-                    array_splice($group_ids,$i,1);
+                if (!api_is_element_in_the_session(TOOL_GROUP, $group_ids[$i])) {
+                    array_splice($group_ids, $i, 1);
                     $i--;
                 }
             }
@@ -623,7 +623,7 @@ 
         } elseif ($forum_state === 0) {
             $sql2 .= " forum_group_public_private='unavailable' ";
         }
-        $sql2 .=" WHERE c_id = $course_id AND forum_of_group=".$group_id;
+        $sql2 .= " WHERE c_id = $course_id AND forum_of_group=".$group_id;
         Database::query($sql2);
         return $result;
     }
@@ -653,13 +653,13 @@ 
     public static function get_categories($course_code = null)
     {
         $course_info = api_get_course_info($course_code);
-        $course_id     = $course_info['real_id'];
+        $course_id = $course_info['real_id'];
         $table_group_cat = Database :: get_course_table(TABLE_GROUP_CATEGORY);
         $sql = "SELECT * FROM $table_group_cat
                 WHERE c_id = $course_id
                 ORDER BY display_order";
         $res = Database::query($sql);
-        $cats = array ();
+        $cats = array();
         while ($cat = Database::fetch_array($res)) {
             $cats[] = $cat;
         }
@@ -771,7 +771,7 @@ 
                 WHERE c_id = $course_id AND category_id='".$cat_id."'";
         $res = Database::query($sql);
         if (Database::num_rows($res) > 0) {
-            $groups_to_delete = array ();
+            $groups_to_delete = array();
             while ($group = Database::fetch_object($res)) {
                 $groups_to_delete[] = $group->id;
             }
@@ -939,7 +939,7 @@ 
      */
     public static function get_current_max_groups_per_user($category_id = null, $course_code = null)
     {
-        $course_info = api_get_course_info ($course_code);
+        $course_info = api_get_course_info($course_code);
         $group_table = Database :: get_course_table(TABLE_GROUP);
         $group_user_table = Database :: get_course_table(TABLE_GROUP_USER);
         $sql = 'SELECT COUNT(gu.group_id) AS current_max
@@ -1182,17 +1182,17 @@ 
     {
         $_course = api_get_course_info();
 
-        $group_ids = is_array($group_ids) ? $group_ids : array ($group_ids);
+        $group_ids = is_array($group_ids) ? $group_ids : array($group_ids);
         $group_ids = array_map('intval', $group_ids);
 
         if (api_is_course_coach()) {
-            for ($i=0 ; $i < count($group_ids) ; $i++) {
-                if (!api_is_element_in_the_session(TOOL_GROUP, $group_ids[$i])){
-                    array_splice($group_ids,$i,1);
+            for ($i = 0; $i < count($group_ids); $i++) {
+                if (!api_is_element_in_the_session(TOOL_GROUP, $group_ids[$i])) {
+                    array_splice($group_ids, $i, 1);
                     $i--;
                 }
             }
-            if (count($group_ids)==0) {
+            if (count($group_ids) == 0) {
                 return false;
             }
         }
@@ -1231,9 +1231,9 @@ 
          * Retrieve course users (reverse) ordered by the number
          * of group they are already enrolled
          */
-        for ($i = 0; $i < count($complete_user_list); $i ++) {
+        for ($i = 0; $i < count($complete_user_list); $i++) {
             //find # of groups the user is enrolled in
-            $number_of_groups = self :: user_in_number_of_groups($complete_user_list[$i]["user_id"], (isset($category['id'])?$category['id']:null));
+            $number_of_groups = self :: user_in_number_of_groups($complete_user_list[$i]["user_id"], (isset($category['id']) ? $category['id'] : null));
             //add # of groups to user list
             $complete_user_list[$i]['number_groups_left'] = $number_groups_per_user - $number_of_groups;
         }
@@ -1245,7 +1245,7 @@ 
 
         //now sort by # of group left
         $complete_user_list = TableSort :: sort_table($complete_user_list, 'number_groups_left', SORT_DESC);
-        $userToken = array ();
+        $userToken = array();
         foreach ($complete_user_list as $this_user) {
             if ($this_user['number_groups_left'] > 0) {
                 $userToken[$this_user['user_id']] = $this_user['number_groups_left'];
@@ -1440,7 +1440,7 @@ 
                 if ($category['groups_per_user'] == self::GROUP_PER_MEMBER_NO_LIMIT) {
                     $category['groups_per_user'] = self::INFINITE;
                 }
-                $result = self:: user_in_number_of_groups($user_id, $category['id'] ) < $category['groups_per_user'];
+                $result = self:: user_in_number_of_groups($user_id, $category['id']) < $category['groups_per_user'];
                 if ($result == false) {
                     return false;
                 }
@@ -1551,7 +1551,7 @@ 
                     tg.group_id='".$group_id."' AND
                     tg.user_id=u.user_id".$order_clause;
         $db_result = Database::query($sql);
-        $users = array ();
+        $users = array();
         while ($user = Database::fetch_object($db_result)) {
             if (!$id_only) {
                 $member['user_id'] = $user->user_id;
@@ -1616,8 +1616,8 @@ 
         foreach ($user_ids as $user_id) {
             $user_id = intval($user_id);
             if (self::can_user_subscribe($user_id, $group_id, false)) {
-                $sql = "INSERT INTO " . $table_group_tutor . " (c_id, user_id, group_id)
-                        VALUES ('$course_id', '" . $user_id . "', '" . $group_id . "')";
+                $sql = "INSERT INTO ".$table_group_tutor." (c_id, user_id, group_id)
+                        VALUES ('$course_id', '".$user_id."', '".$group_id."')";
                 $result &= Database::query($sql);
             }
         }
@@ -1633,7 +1633,7 @@ 
      */
     public static function unsubscribe_users($user_ids, $group_id)
     {
-        $user_ids = is_array($user_ids) ? $user_ids : array ($user_ids);
+        $user_ids = is_array($user_ids) ? $user_ids : array($user_ids);
         $table_group_user = Database :: get_course_table(TABLE_GROUP_USER);
         $group_id = intval($group_id);
         $course_id = api_get_course_int_id();
@@ -2179,7 +2179,7 @@ 
          * Retrieve course users (reverse) ordered by the number
          * of group they are already enrolled
          */
-        for ($i = 0; $i < count($complete_user_list); $i ++) {
+        for ($i = 0; $i < count($complete_user_list); $i++) {
             // find # of groups the user is enrolled in
             $number_of_groups = self:: user_in_number_of_groups(
                 $complete_user_list[$i]["user_id"],
@@ -2312,14 +2312,14 @@ 
                 !(api_is_course_coach() && intval($this_group['session_id']) != $session_id)
             ) {
                 $edit_actions = '<a href="'.$url.'settings.php?'.api_get_cidreq(true, false).'&gidReq='.$this_group['id'].'"  title="'.get_lang('Edit').'">'.
-                    Display::return_icon('edit.png', get_lang('EditGroup'),'',ICON_SIZE_SMALL).'</a>&nbsp;';
+                    Display::return_icon('edit.png', get_lang('EditGroup'), '', ICON_SIZE_SMALL).'</a>&nbsp;';
 
                 if ($this_group['status'] == 1) {
-                    $edit_actions .= '<a href="' . api_get_self() . '?' . api_get_cidreq(true,false) . '&category=' . $category_id . '&action=set_invisible&id=' . $this_group['id'] . '" title="' . get_lang('Hide') . '">' .
-                        Display::return_icon('visible.png', get_lang('Hide'), '', ICON_SIZE_SMALL) . '</a>&nbsp;';
+                    $edit_actions .= '<a href="'.api_get_self().'?'.api_get_cidreq(true, false).'&category='.$category_id.'&action=set_invisible&id='.$this_group['id'].'" title="'.get_lang('Hide').'">'.
+                        Display::return_icon('visible.png', get_lang('Hide'), '', ICON_SIZE_SMALL).'</a>&nbsp;';
                 } else {
-                    $edit_actions .= '<a href="' . api_get_self() . '?' . api_get_cidreq(true, false) . '&category=' . $category_id . '&action=set_visible&id=' . $this_group['id'] . '" title="' . get_lang('Show') . '">' .
-                        Display::return_icon('invisible.png', get_lang('Show'), '', ICON_SIZE_SMALL) . '</a>&nbsp;';
+                    $edit_actions .= '<a href="'.api_get_self().'?'.api_get_cidreq(true, false).'&category='.$category_id.'&action=set_visible&id='.$this_group['id'].'" title="'.get_lang('Show').'">'.
+                        Display::return_icon('invisible.png', get_lang('Show'), '', ICON_SIZE_SMALL).'</a>&nbsp;';
                 }
 
                 $edit_actions .= '<a href="'.$url.'member_settings.php?'.api_get_cidreq(true, false).'&gidReq='.$this_group['id'].'"  title="'.get_lang('GroupMembers').'">'.
@@ -2332,10 +2332,10 @@ 
                     Display::return_icon('clean.png',get_lang('EmptyGroup'),'',ICON_SIZE_SMALL).'</a>&nbsp;';*/
 
                 $edit_actions .= '<a href="'.api_get_self().'?'.api_get_cidreq(true, false).'&category='.$category_id.'&action=fill_one&id='.$this_group['id'].'" onclick="javascript: if(!confirm('."'".addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES))."'".')) return false;" title="'.get_lang('FillGroup').'">'.
-                    Display::return_icon('fill.png',get_lang('FillGroup'),'',ICON_SIZE_SMALL).'</a>&nbsp;';
+                    Display::return_icon('fill.png', get_lang('FillGroup'), '', ICON_SIZE_SMALL).'</a>&nbsp;';
 
                 $edit_actions .= '<a href="'.api_get_self().'?'.api_get_cidreq(true, false).'&category='.$category_id.'&action=delete_one&id='.$this_group['id'].'" onclick="javascript: if(!confirm('."'".addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES))."'".')) return false;" title="'.get_lang('Delete').'">'.
-                    Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>&nbsp;';
+                    Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'</a>&nbsp;';
 
                 $row[] = $edit_actions;
             }
@@ -2707,7 +2707,7 @@ 
         $activeTutor = null;
         $activeMember = null;
 
-        switch($default) {
+        switch ($default) {
             case 'settings':
                 $activeSettings = 'active';
                 break;

main/inc/lib/hook/HookManagement.php

Doc Comments +1 added lines, -1 removed lines

@@ -138,7 +138,7 @@
 
     /**
      * Return a list an associative array where keys are the active hook observer class name
-     * @param $eventName
+     * @param string $eventName
      *
      * @return array
      */

Spacing +14 added lines, -14 removed lines

@@ -145,10 +145,10 @@ 
     public function listHookObservers($eventName)
     {
         $array = array();
-        $joinTable = $this->tables[TABLE_HOOK_CALL] . ' hc' .
-            ' INNER JOIN ' . $this->tables[TABLE_HOOK_EVENT] . ' he' .
-            ' ON hc.hook_event_id = he.id ' .
-            ' INNER JOIN ' . $this->tables[TABLE_HOOK_OBSERVER] . ' ho ' .
+        $joinTable = $this->tables[TABLE_HOOK_CALL].' hc'.
+            ' INNER JOIN '.$this->tables[TABLE_HOOK_EVENT].' he'.
+            ' ON hc.hook_event_id = he.id '.
+            ' INNER JOIN '.$this->tables[TABLE_HOOK_OBSERVER].' ho '.
             ' ON hc.hook_observer_id = ho.id ';
         $columns = 'ho.class_name, ho.path, ho.plugin_name, hc.enabled';
         $where = array('where' => array('he.class_name = ? ' => $eventName, 'AND hc.enabled = ? ' => 1));
@@ -202,10 +202,10 @@ 
     public function listAllHookCalls()
     {
         $array = array();
-        $joinTable = $this->tables[TABLE_HOOK_CALL] . ' hc' .
-            ' INNER JOIN ' . $this->tables[TABLE_HOOK_EVENT] . ' he' .
-            ' ON hc.hook_event_id = he.id ' .
-            ' INNER JOIN ' . $this->tables[TABLE_HOOK_OBSERVER] . ' ho ' .
+        $joinTable = $this->tables[TABLE_HOOK_CALL].' hc'.
+            ' INNER JOIN '.$this->tables[TABLE_HOOK_EVENT].' he'.
+            ' ON hc.hook_event_id = he.id '.
+            ' INNER JOIN '.$this->tables[TABLE_HOOK_OBSERVER].' ho '.
             ' ON hc.hook_observer_id = ho.id ';
         $columns = 'he.class_name AS event_class_name, ho.class_name AS observer_class_name, hc.id AS id, hc.type AS type';
         $rows = Database::select($columns, $joinTable);
@@ -231,7 +231,7 @@ 
         if (isset($eventName) && !isset($this->hookEvents[$eventName])) {
             $attributes = array(
                 'class_name' => $eventName,
-                'description' => get_lang('HookDescription' . $eventName),
+                'description' => get_lang('HookDescription'.$eventName),
             );
             $id = Database::insert($this->tables[TABLE_HOOK_EVENT], $attributes);
             $this->hookEvents[$eventName] = $id;
@@ -240,7 +240,7 @@ 
         // Check if exists hook observer
         if (isset($observerClassName) &&
             !isset($this->hookObservers[$observerClassName])
-        ){
+        ) {
             $object = $observerClassName::create();
             $attributes = array(
                 'class_name' => $observerClassName,
@@ -338,10 +338,10 @@ 
         $eventName = Database::escape_string($eventName);
         $observerClassName($observerClassName);
         $type = Database::escape_string($type);
-        $joinTable = $this->tables[TABLE_HOOK_CALL] . ' hc' .
-            ' INNER JOIN ' . $this->tables[TABLE_HOOK_EVENT] . ' he' .
-            ' ON hc.hook_event_id = he.id ' .
-            ' INNER JOIN ' . $this->tables[TABLE_HOOK_OBSERVER] . ' ho ' .
+        $joinTable = $this->tables[TABLE_HOOK_CALL].' hc'.
+            ' INNER JOIN '.$this->tables[TABLE_HOOK_EVENT].' he'.
+            ' ON hc.hook_event_id = he.id '.
+            ' INNER JOIN '.$this->tables[TABLE_HOOK_OBSERVER].' ho '.
             ' ON hc.hook_observer_id = ho.id ';
         $row = Database::select(
             'id',

main/inc/lib/login.lib.php

Doc Comments +2 added lines, -1 removed lines

@@ -266,6 +266,7 @@ 
      * @global bool   $is_platformAdmin
      * @global bool   $is_allowedCreateCourse
      * @global object $_user
+     * @param boolean $reset
      */
     public static function init_user($user_id, $reset)
     {
@@ -355,7 +356,7 @@ 
      * @global type $is_allowed_in_course
      *
      * @param type $course_id
-     * @param type $reset
+     * @param boolean $reset
      */
     static function init_course($course_id, $reset)
     {

Spacing +39 added lines, -39 removed lines

@@ -37,24 +37,24 @@ 
             if ($by_username) {
                 $secret_word = self::get_secret_word($user['email']);
                 if ($reset) {
-                    $reset_link = $portal_url . "main/auth/lostPassword.php?reset=" . $secret_word . "&id=" . $user['uid'];
+                    $reset_link = $portal_url."main/auth/lostPassword.php?reset=".$secret_word."&id=".$user['uid'];
                 } else {
-                    $reset_link = get_lang('Pass') . " : $user[password]";
+                    $reset_link = get_lang('Pass')." : $user[password]";
                 }
-                $user_account_list = get_lang('YourRegistrationData') . " : \n" . get_lang('UserName') . ' : ' . $user['loginName'] . "\n" . get_lang('ResetLink') . ' : ' . $reset_link . '';
+                $user_account_list = get_lang('YourRegistrationData')." : \n".get_lang('UserName').' : '.$user['loginName']."\n".get_lang('ResetLink').' : '.$reset_link.'';
 
                 if ($user_account_list) {
-                    $user_account_list = "\n-----------------------------------------------\n" . $user_account_list;
+                    $user_account_list = "\n-----------------------------------------------\n".$user_account_list;
                 }
             } else {
                 foreach ($user as $this_user) {
                     $secret_word = self::get_secret_word($this_user['email']);
                     if ($reset) {
-                        $reset_link = $portal_url . "main/auth/lostPassword.php?reset=" . $secret_word . "&id=" . $this_user['uid'];
+                        $reset_link = $portal_url."main/auth/lostPassword.php?reset=".$secret_word."&id=".$this_user['uid'];
                     } else {
-                        $reset_link = get_lang('Pass') . " : $this_user[password]";
+                        $reset_link = get_lang('Pass')." : $this_user[password]";
                     }
-                    $user_account_list[] = get_lang('YourRegistrationData') . " : \n" . get_lang('UserName') . ' : ' . $this_user['loginName'] . "\n" . get_lang('ResetLink') . ' : ' . $reset_link . '';
+                    $user_account_list[] = get_lang('YourRegistrationData')." : \n".get_lang('UserName').' : '.$this_user['loginName']."\n".get_lang('ResetLink').' : '.$reset_link.'';
                 }
                 if ($user_account_list) {
                     $user_account_list = implode("\n-----------------------------------------------\n", $user_account_list);
@@ -64,8 +64,8 @@ 
             if (!$by_username) {
                 $user = $user[0];
             }
-            $reset_link = get_lang('Pass') . " : $user[password]";
-            $user_account_list = get_lang('YourRegistrationData') . " : \n" . get_lang('UserName') . ' : ' . $user['loginName'] . "\n" . $reset_link . '';
+            $reset_link = get_lang('Pass')." : $user[password]";
+            $user_account_list = get_lang('YourRegistrationData')." : \n".get_lang('UserName').' : '.$user['loginName']."\n".$reset_link.'';
         }
         return $user_account_list;
     }
@@ -78,7 +78,7 @@ 
      */
     public static function send_password_to_user($user, $by_username = false)
     {
-        $email_subject = "[" . api_get_setting('siteName') . "] " . get_lang('LoginRequest'); // SUBJECT
+        $email_subject = "[".api_get_setting('siteName')."] ".get_lang('LoginRequest'); // SUBJECT
 
         if ($by_username) { // Show only for lost password
             $user_account_list = self::get_user_account_list($user, false, $by_username); // BODY
@@ -97,7 +97,7 @@ 
             }
         }
 
-        $email_body = get_lang('YourAccountParam') . " " . $portal_url . "\n\n$user_account_list";
+        $email_body = get_lang('YourAccountParam')." ".$portal_url."\n\n$user_account_list";
         // SEND MESSAGE
         $sender_name = api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, PERSON_NAME_EMAIL_ADDRESS);
         $email_admin = api_get_setting('emailAdministrator');
@@ -131,7 +131,7 @@ 
      */
     public static function handle_encrypted_password($user, $by_username = false)
     {
-        $email_subject = "[" . api_get_setting('siteName') . "] " . get_lang('LoginRequest'); // SUBJECT
+        $email_subject = "[".api_get_setting('siteName')."] ".get_lang('LoginRequest'); // SUBJECT
 
         if ($by_username) {
         // Show only for lost password
@@ -141,11 +141,11 @@ 
             $user_account_list = self::get_user_account_list($user, true); // BODY
             $email_to = $user[0]['email'];
         }
-        $email_body = get_lang('DearUser') . " :\n" . get_lang('password_request') . "\n";
-        $email_body .= $user_account_list . "\n-----------------------------------------------\n\n";
+        $email_body = get_lang('DearUser')." :\n".get_lang('password_request')."\n";
+        $email_body .= $user_account_list."\n-----------------------------------------------\n\n";
         $email_body .= get_lang('PasswordEncryptedForSecurity');
 
-        $email_body .= "\n\n" . get_lang('SignatureFormula') . ",\n" . api_get_setting('administratorName') . " " . api_get_setting('administratorSurname') . "\n" . get_lang('PlataformAdmin') . " - " . api_get_setting('siteName');
+        $email_body .= "\n\n".get_lang('SignatureFormula').",\n".api_get_setting('administratorName')." ".api_get_setting('administratorSurname')."\n".get_lang('PlataformAdmin')." - ".api_get_setting('siteName');
 
         $sender_name = api_get_person_name(
             api_get_setting('administratorName'),
@@ -238,7 +238,7 @@ 
                     username AS loginName,
                     password,
                     email
-                FROM " . $tbl_user . "
+                FROM " . $tbl_user."
                 WHERE user_id = $id";
         $result = Database::query($sql);
         $num_rows = Database::num_rows($result);
@@ -291,7 +291,7 @@ 
                         ON user.user_id = a.user_id
                         LEFT JOIN $track_e_login login
                         ON user.user_id  = login.login_user_id
-                        WHERE user.user_id = '" . $_user['user_id'] . "'
+                        WHERE user.user_id = '".$_user['user_id']."'
                         ORDER BY login.login_date DESC LIMIT 1";
 
                 $result = Database::query($sql);
@@ -321,7 +321,7 @@ 
                     Session::write('is_platformAdmin', $is_platformAdmin);
                     Session::write('is_allowedCreateCourse', $is_allowedCreateCourse);
                 } else {
-                    header('location:' . api_get_path(WEB_PATH));
+                    header('location:'.api_get_path(WEB_PATH));
                     //exit("WARNING UNDEFINED UID !! ");
                 }
             } else { // no uid => logout or Anonymous
@@ -368,9 +368,9 @@ 
         global $_course;
         global $_real_cid;
 
-        global $is_courseAdmin;  //course teacher
-        global $is_courseTutor;  //course teacher - some rights
-        global $is_courseCoach;  //course coach
+        global $is_courseAdmin; //course teacher
+        global $is_courseTutor; //course teacher - some rights
+        global $is_courseCoach; //course coach
         global $is_courseMember; //course student
         global $is_sessionAdmin;
         global $is_allowed_in_course;
@@ -427,7 +427,7 @@ 
 
                     if (!empty($_GET['id_session'])) {
                         $_SESSION['id_session'] = intval($_GET['id_session']);
-                        $sql = 'SELECT name FROM ' . $tbl_session . ' WHERE id="' . intval($_SESSION['id_session']) . '"';
+                        $sql = 'SELECT name FROM '.$tbl_session.' WHERE id="'.intval($_SESSION['id_session']).'"';
                         $rs = Database::query($sql);
                         list($_SESSION['session_name']) = Database::fetch_array($rs);
                     } else {
@@ -443,7 +443,7 @@ 
                     }
                 } else {
                     //exit("WARNING UNDEFINED CID !! ");
-                    header('location:' . api_get_path(WEB_PATH));
+                    header('location:'.api_get_path(WEB_PATH));
                 }
             } else {
                 Session::erase('_cid');
@@ -470,7 +470,7 @@ 
         } else {
             // Continue with the previous values
             if (empty($_SESSION['_course']) OR empty($_SESSION['_cid'])) { //no previous values...
-                $_cid = -1;        //set default values that will be caracteristic of being unset
+                $_cid = -1; //set default values that will be caracteristic of being unset
                 $_course = -1;
             } else {
                 $_cid = $_SESSION['_cid'];
@@ -480,7 +480,7 @@ 
                 // Moreover, if we want to track a course with another session it can be usefull
                 if (!empty($_GET['id_session'])) {
                     $tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
-                    $sql = 'SELECT name FROM ' . $tbl_session . ' WHERE id="' . intval($_SESSION['id_session']) . '"';
+                    $sql = 'SELECT name FROM '.$tbl_session.' WHERE id="'.intval($_SESSION['id_session']).'"';
                     $rs = Database::query($sql);
                     list($_SESSION['session_name']) = Database::fetch_array($rs);
                     $_SESSION['id_session'] = intval($_GET['id_session']);
@@ -520,9 +520,9 @@ 
                             //But only if the login date is < than now + max_life_time
                             $sql = "SELECT course_access_id FROM $course_tracking_table
                                     WHERE
-                                        user_id     = " . intval($_user ['user_id']) . " AND
+                                        user_id     = ".intval($_user ['user_id'])." AND
                                         c_id = '".api_get_course_int_id()."' AND
-                                        session_id  = " . api_get_session_id() . " AND
+                                        session_id  = " . api_get_session_id()." AND
                                         login_course_date > now() - INTERVAL $session_lifetime SECOND
                                     ORDER BY login_course_date DESC LIMIT 0,1";
                             $result = Database::query($sql);
@@ -532,11 +532,11 @@ 
                                 //We update the course tracking table
                                 $sql = "UPDATE $course_tracking_table
                                         SET logout_course_date = '$time', counter = counter+1
-                                        WHERE course_access_id = " . intval($i_course_access_id) . " AND session_id = " . api_get_session_id();
+                                        WHERE course_access_id = ".intval($i_course_access_id)." AND session_id = ".api_get_session_id();
                                 Database::query($sql);
                             } else {
-                                $sql = "INSERT INTO $course_tracking_table (c_id, user_id, login_course_date, logout_course_date, counter, session_id)" .
-                                        "VALUES('" . api_get_course_int_id() . "', '" . $_user['user_id'] . "', '$time', '$time', '1','" . api_get_session_id() . "')";
+                                $sql = "INSERT INTO $course_tracking_table (c_id, user_id, login_course_date, logout_course_date, counter, session_id)".
+                                        "VALUES('".api_get_course_int_id()."', '".$_user['user_id']."', '$time', '$time', '1','".api_get_session_id()."')";
                                 Database::query($sql);
                             }
                         }
@@ -564,8 +564,8 @@ 
                 $course_user_table = Database::get_main_table(TABLE_MAIN_COURSE_USER);
                 $sql = "SELECT * FROM $course_user_table
                        WHERE
-                        user_id  = '" . $user_id . "' AND
-                        relation_type <> " . COURSE_RELATION_TYPE_RRHH . " AND
+                        user_id  = '".$user_id."' AND
+                        relation_type <> " . COURSE_RELATION_TYPE_RRHH." AND
                         course_code = '$course_id'";
                 $result = Database::query($sql);
 
@@ -585,8 +585,8 @@ 
                             $session_id
                         );
                         if (!$user_is_subscribed) {
-                            $url = api_get_path(WEB_CODE_PATH) . 'course_info/legal.php?course_code=' . $_course['code'] . '&session_id=' . $session_id;
-                            header('Location: ' . $url);
+                            $url = api_get_path(WEB_CODE_PATH).'course_info/legal.php?course_code='.$_course['code'].'&session_id='.$session_id;
+                            header('Location: '.$url);
                             exit;
                         }
                     }
@@ -627,11 +627,11 @@ 
                         } else {
                             //Im a coach or a student?
                             $sql = "SELECT user_id, status
-                                    FROM " . $tbl_session_course_user . "
+                                    FROM " . $tbl_session_course_user."
                                     WHERE
                                         c_id = '$_cid' AND
-                                        user_id = '" . $user_id . "' AND
-                                        session_id = '" . $session_id . "'
+                                        user_id = '".$user_id."' AND
+                                        session_id = '" . $session_id."'
                                     LIMIT 1";
                             $result = Database::query($sql);
 
@@ -777,7 +777,7 @@ 
         if ($reset) { // session data refresh requested
             if ($group_id && $_cid && !empty($_course['real_id'])) { // have keys to search data
                 $group_table = Database::get_course_table(TABLE_GROUP);
-                $sql = "SELECT * FROM $group_table WHERE c_id = " . $_course['real_id'] . " AND id = '$group_id'";
+                $sql = "SELECT * FROM $group_table WHERE c_id = ".$_course['real_id']." AND id = '$group_id'";
                 $result = Database::query($sql);
                 if (Database::num_rows($result) > 0) { // This group has recorded status related to this course
                     $gpData = Database::fetch_array($result);
@@ -830,7 +830,7 @@ 
      */
     public static function get_user_accounts_by_username($username)
     {
-        if (strpos($username,'@')){
+        if (strpos($username, '@')) {
             $username = api_strtolower($username);
             $email = true;
         } else {

Indentation +6 added lines, -6 removed lines

@@ -852,14 +852,14 @@ 
             $email = false;
         }
 
-		if ($email) {
-			$condition = "LOWER(email) = '".Database::escape_string($username)."' ";
-		} else {
+        if ($email) {
+            $condition = "LOWER(email) = '".Database::escape_string($username)."' ";
+        } else {
             $condition = "LOWER(username) = '".Database::escape_string($username)."'";
         }
 
-		$tbl_user = Database :: get_main_table(TABLE_MAIN_USER);
-		$query = "SELECT 
+        $tbl_user = Database :: get_main_table(TABLE_MAIN_USER);
+        $query = "SELECT 
 		            user_id AS uid, 
 		            lastname AS lastName, 
 		            firstname AS firstName, 
@@ -874,7 +874,7 @@ 
                     auth_source
 				 FROM $tbl_user
 				 WHERE ( $condition AND active = 1) ";
-		$result = Database::query($query);
+        $result = Database::query($query);
         $num_rows = Database::num_rows($result);
         if ($result && $num_rows > 0) {
             return Database::fetch_assoc($result);

main/inc/lib/model.lib.php

Doc Comments +1 added lines

@@ -25,6 +25,7 @@
 
     /**
      * Useful finder - experimental akelos like only use in notification.lib.php send function
+     * @param string $type
      */
     public function find($type, $options = null)
     {

main/inc/lib/myspace.lib.php

Doc Comments +3 added lines, -3 removed lines

@@ -634,7 +634,6 @@ 
      * @param   int $sessionId  The session ID
      * @param   int $courseId   The course ID
      * @param   int $exerciseId The quiz ID
-     * @param   int $answer Answer status (0 = incorrect, 1 = correct, 2 = both)
      * @return  string  HTML array of results formatted for gridJS
      * @author César Perales <cesar.perales@beeznest.com>, Beeznest Team
      */
@@ -1222,6 +1221,7 @@ 
      * @param int Number of items to select
      * @param string Column to order on
      * @param string Order direction
+     * @param integer $number_of_items
      * @return array Results
      */
     public static function get_course_data_tracking_overview($from, $number_of_items, $column, $direction)
@@ -1556,6 +1556,7 @@ 
      * @param int Number of items to select
      * @param string Column to order on
      * @param string Order direction
+     * @param integer $number_of_items
      * @return array Results
      */
     public static function get_session_data_tracking_overview($from, $number_of_items, $column, $direction)
@@ -1576,7 +1577,6 @@ 
     /**
      * Fills in session reporting data
      *
-     * @param integer $user_id the id of the user
      * @param array $url_params additonal url parameters
      * @param array $row the row information (the other columns)
      * @return string html code
@@ -2206,6 +2206,7 @@ 
      * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University, Belgium
      * @version Dokeos 1.8.6
      * @since October 2008
+     * @param integer $number_of_items
      */
     public static function get_user_data_tracking_overview($from, $number_of_items, $column, $direction)
     {
@@ -2308,7 +2309,6 @@ 
     /**
      * Checks if there are repeted users in a given array
      * @param  array $usernames list of the usernames in the uploaded file
-     * @param  array $user_array['username'] and $user_array['sufix'] where sufix is the number part in a login i.e -> jmontoya2
      * @return array with the $usernames array and the $user_array array
      * @author Julio Montoya Armas
      */

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 +168 added lines, -168 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();
     }
 
@@ -371,7 +371,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', ''),
@@ -381,7 +381,7 @@ 
                 get_lang('NumberOfSessions', '')
             );
         } else {
-            $csv_header[] = array (
+            $csv_header[] = array(
                 get_lang('LastName', ''),
                 get_lang('FirstName', ''),
                 get_lang('TimeSpentOnThePlatform', ''),
@@ -523,9 +523,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'));
             }
         }
 
@@ -584,7 +584,7 @@ 
         /**
          * Column config
          */
-        $column_model   = array(
+        $column_model = array(
             array(
                 'name' => 'username',
                 'index' => 'username',
@@ -625,7 +625,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';
@@ -647,11 +647,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"});
                        }
@@ -701,7 +701,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'),
@@ -718,7 +718,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';
@@ -729,11 +729,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"});
                        }
@@ -819,8 +819,8 @@ 
 
                     $column[] = $title;
                     $column_model[] = array(
-                        'name' => 'exer' . $i,
-                        'index' => 'exer' . $i,
+                        'name' => 'exer'.$i,
+                        'index' => 'exer'.$i,
                         'align' => 'center',
                         'search' => 'true',
                         'wrap_cell' => "true"
@@ -832,7 +832,7 @@ 
 
         //end 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_grade&session_id=' . $sessionId . '&course_id=' . $courseId;
+        $url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_exercise_grade&session_id='.$sessionId.'&course_id='.$courseId;
 
         // Autowidth
         $extra_params['autowidth'] = 'true';
@@ -843,13 +843,13 @@ 
         $tableId = 'exerciseGradeOverview';
         $table = Display::grid_js($tableId, $url, $column, $column_model, $extra_params, array(), '', true);
 
-        $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",{
+        $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"});
+                           jQuery("#' . $tableId.'").jqGrid("excelExport",{"url":"'.$url.'&export_format=xls"});
                        }
                 });
             });</script>';
@@ -882,10 +882,10 @@ 
         /**
          * Column config
          */
-        $column_model   = array(
-            array('name'=>'username',   'index'=>'username',    'align'=>'left', 'search' => 'true', 'wrap_cell' => "true"),
-            array('name'=>'firstname',  'index'=>'firstname',   'align'=>'left', 'search' => 'true'),
-            array('name'=>'lastname',   'index'=>'lastname',    'align'=>'left', 'search' => 'true'),
+        $column_model = array(
+            array('name'=>'username', 'index'=>'username', 'align'=>'left', 'search' => 'true', 'wrap_cell' => "true"),
+            array('name'=>'firstname', 'index'=>'firstname', 'align'=>'left', 'search' => 'true'),
+            array('name'=>'lastname', 'index'=>'lastname', 'align'=>'left', 'search' => 'true'),
         );
         //get dinamic column names
         foreach ($questions as $question_id => $question) {
@@ -901,7 +901,7 @@ 
         $action_links = '';
 
         // jqgrid will use this URL to do the selects
-        $url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_survey_overview&session_id=' . $sessionId . '&course_id=' . $courseId . '&survey_id=' . $surveyId . '&date_to=' . $date_to . '&date_from=' . $date_from;
+        $url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_survey_overview&session_id='.$sessionId.'&course_id='.$courseId.'&survey_id='.$surveyId.'&date_to='.$date_to.'&date_from='.$date_from;
 
         // Table Id
         $tableId = 'lpProgress';
@@ -923,11 +923,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"});
                        }
@@ -942,7 +942,7 @@ 
      * Display a sortable table that contains an overview off all the progress of the user in a session
      * @author César Perales <cesar.perales@beeznest.com>, Beeznest Team
      */
-    static function display_tracking_progress_overview($sessionId = 0, $courseId = 0,  $date_from, $date_to)
+    static function display_tracking_progress_overview($sessionId = 0, $courseId = 0, $date_from, $date_to)
     {
         //The order is important you need to check the the $column variable in the model.ajax.php file
         $columns = array(
@@ -992,55 +992,55 @@ 
         );
 
         //Column config
-        $column_model   = array(
-            array('name'=>'lastname',   'index'=>'lastname',     'align'=>'left'),
-            array('name'=>'firstname',  'index'=>'firstname',    'align'=>'left'),
-            array('name'=>'username',   'index'=>'username',     'align'=>'left'),
+        $column_model = array(
+            array('name'=>'lastname', 'index'=>'lastname', 'align'=>'left'),
+            array('name'=>'firstname', 'index'=>'firstname', 'align'=>'left'),
+            array('name'=>'username', 'index'=>'username', 'align'=>'left'),
             #array('name'=>'profile',   'index'=>'username',     'align'=>'left'),
-            array('name'=>'total',      'index'=>'total',        'align'=>'left'),
-            array('name'=>'courses',    'index'=>'courses',      'align'=>'left', 'sortable' => 'false'),
-            array('name'=>'lessons',    'index'=>'lessons',      'align'=>'left', 'sortable' => 'false'),
-            array('name'=>'exercises',  'index'=>'exercises',    'align'=>'left', 'sortable' => 'false'),
-            array('name'=>'forums',     'index'=>'forums',       'align'=>'left', 'sortable' => 'false'),
-            array('name'=>'homeworks',  'index'=>'homeworks',    'align'=>'left', 'sortable' => 'false'),
-            array('name'=>'wikis',      'index'=>'wikis',        'align'=>'left', 'sortable' => 'false'),
-            array('name'=>'surveys',    'index'=>'surveys',      'align'=>'left', 'sortable' => 'false'),
+            array('name'=>'total', 'index'=>'total', 'align'=>'left'),
+            array('name'=>'courses', 'index'=>'courses', 'align'=>'left', 'sortable' => 'false'),
+            array('name'=>'lessons', 'index'=>'lessons', 'align'=>'left', 'sortable' => 'false'),
+            array('name'=>'exercises', 'index'=>'exercises', 'align'=>'left', 'sortable' => 'false'),
+            array('name'=>'forums', 'index'=>'forums', 'align'=>'left', 'sortable' => 'false'),
+            array('name'=>'homeworks', 'index'=>'homeworks', 'align'=>'left', 'sortable' => 'false'),
+            array('name'=>'wikis', 'index'=>'wikis', 'align'=>'left', 'sortable' => 'false'),
+            array('name'=>'surveys', 'index'=>'surveys', 'align'=>'left', 'sortable' => 'false'),
             //Lessons
-            array('name'=>'lessons_total',    'index'=>'lessons_total',      'align'=>'center', 'sortable' => 'false'),
-            array('name'=>'lessons_done',     'index'=>'lessons_done',       'align'=>'center', 'sortable' => 'false'),
-            array('name'=>'lessons_left',     'index'=>'lessons_left',       'align'=>'center', 'sortable' => 'false'),
-            array('name'=>'lessons_progress', 'index'=>'lessons_progress',   'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'lessons_total', 'index'=>'lessons_total', 'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'lessons_done', 'index'=>'lessons_done', 'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'lessons_left', 'index'=>'lessons_left', 'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'lessons_progress', 'index'=>'lessons_progress', 'align'=>'center', 'sortable' => 'false'),
             //Exercises
-            array('name'=>'exercises_total',    'index'=>'exercises_total',      'align'=>'center', 'sortable' => 'false'),
-            array('name'=>'exercises_done',     'index'=>'exercises_done',       'align'=>'center', 'sortable' => 'false'),
-            array('name'=>'exercises_left',     'index'=>'exercises_left',       'align'=>'center', 'sortable' => 'false'),
-            array('name'=>'exercises_progress', 'index'=>'exercises_progress',   'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'exercises_total', 'index'=>'exercises_total', 'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'exercises_done', 'index'=>'exercises_done', 'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'exercises_left', 'index'=>'exercises_left', 'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'exercises_progress', 'index'=>'exercises_progress', 'align'=>'center', 'sortable' => 'false'),
             //Assignments
-            array('name'=>'forums_total',    'index'=>'forums_total',        'align'=>'center', 'sortable' => 'false'),
-            array('name'=>'forums_done',     'index'=>'forums_done',         'align'=>'center', 'sortable' => 'false'),
-            array('name'=>'forums_left',     'index'=>'forums_left',         'align'=>'center', 'sortable' => 'false'),
-            array('name'=>'forums_progress', 'index'=>'forums_progress',     'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'forums_total', 'index'=>'forums_total', 'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'forums_done', 'index'=>'forums_done', 'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'forums_left', 'index'=>'forums_left', 'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'forums_progress', 'index'=>'forums_progress', 'align'=>'center', 'sortable' => 'false'),
             //Assignments
-            array('name'=>'assigments_total',    'index'=>'assigments_total',        'align'=>'center', 'sortable' => 'false'),
-            array('name'=>'assigments_done',     'index'=>'assigments_done',         'align'=>'center', 'sortable' => 'false'),
-            array('name'=>'assigments_left',     'index'=>'assigments_left',         'align'=>'center', 'sortable' => 'false'),
-            array('name'=>'assigments_progress', 'index'=>'assigments_progress',     'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'assigments_total', 'index'=>'assigments_total', 'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'assigments_done', 'index'=>'assigments_done', 'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'assigments_left', 'index'=>'assigments_left', 'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'assigments_progress', 'index'=>'assigments_progress', 'align'=>'center', 'sortable' => 'false'),
             //Assignments
-            array('name'=>'wiki_total',         'index'=>'wiki_total',       'align'=>'center', 'sortable' => 'false'),
-            array('name'=>'wiki_revisions',     'index'=>'wiki_revisions',   'align'=>'center', 'sortable' => 'false'),
-            array('name'=>'wiki_read',          'index'=>'wiki_read',        'align'=>'center', 'sortable' => 'false'),
-            array('name'=>'wiki_unread',        'index'=>'wiki_unread',      'align'=>'center', 'sortable' => 'false'),
-            array('name'=>'wiki_progress',      'index'=>'wiki_progress',    'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'wiki_total', 'index'=>'wiki_total', 'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'wiki_revisions', 'index'=>'wiki_revisions', 'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'wiki_read', 'index'=>'wiki_read', 'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'wiki_unread', 'index'=>'wiki_unread', 'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'wiki_progress', 'index'=>'wiki_progress', 'align'=>'center', 'sortable' => 'false'),
             //Surveys
-            array('name'=>'surveys_total',    'index'=>'surveys_total',      'align'=>'center', 'sortable' => 'false'),
-            array('name'=>'surveys_done',     'index'=>'surveys_done',       'align'=>'center', 'sortable' => 'false'),
-            array('name'=>'surveys_left',     'index'=>'surveys_left',       'align'=>'center', 'sortable' => 'false'),
-            array('name'=>'surveys_progress', 'index'=>'surveys_progress',   'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'surveys_total', 'index'=>'surveys_total', 'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'surveys_done', 'index'=>'surveys_done', 'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'surveys_left', 'index'=>'surveys_left', 'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'surveys_progress', 'index'=>'surveys_progress', 'align'=>'center', 'sortable' => 'false'),
         );
 
         $action_links = '';
         // jqgrid will use this URL to do the selects
-        $url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_session_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_progress&session_id='.$sessionId.'&course_id='.$courseId.'&date_to='.$date_to.'&date_from='.$date_from;
 
         //Table Id
         $tableId = 'progressOverview';
@@ -1100,11 +1100,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"});
                        }
@@ -1164,7 +1164,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);
                     }
                 }
@@ -1179,7 +1179,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 {
@@ -1207,7 +1207,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>';
@@ -1224,13 +1224,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();
     }
 
@@ -1266,7 +1266,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;
         }
@@ -1319,18 +1319,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;
                 }
             }
@@ -1340,27 +1340,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 = '-';
@@ -1468,7 +1468,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];
                 }
@@ -1476,11 +1476,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;
                     }
                 }
@@ -1490,22 +1490,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;
@@ -1541,7 +1541,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>';
@@ -1559,7 +1559,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'));
@@ -1598,7 +1598,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;
         }
@@ -1687,10 +1687,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;
                     }
                 }
@@ -1700,27 +1700,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 = '-';
@@ -1831,7 +1831,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);
@@ -1860,11 +1860,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;
                         }
                     }
@@ -1874,27 +1874,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 = '-';
@@ -1944,7 +1944,7 @@ 
             FROM '.Database :: get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES)."
             WHERE c_id = ' . $courseId . '
             AND exe_user_id = '".intval($user_id)."'";
-        if($session_id !== false) {
+        if ($session_id !== false) {
             $sql .= " AND session_id = '".$session_id."' ";
         }
         $result = Database::query($sql);
@@ -1954,7 +1954,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) {
@@ -2075,9 +2075,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
@@ -2085,7 +2085,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'];
@@ -2093,7 +2093,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));
 
@@ -2127,9 +2127,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);
@@ -2198,7 +2198,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>';
@@ -2207,7 +2207,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,
@@ -2275,7 +2275,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;
         }
@@ -2330,7 +2330,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' => '');
@@ -2605,7 +2605,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;
@@ -2639,10 +2639,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 = '          ';
                     }
 
@@ -2705,7 +2705,7 @@ 
         global $current_tag;
         switch ($data) {
             case 'Contact' :
-                $user = array ();
+                $user = array();
                 break;
             default :
                 $current_tag = $data;
@@ -2752,9 +2752,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)));
@@ -2800,7 +2800,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
                 ])
@@ -2819,7 +2819,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;
                     }
                 "
             ]
@@ -2850,7 +2850,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;
                     }
                 "
             ]
@@ -2876,8 +2876,8 @@ 
         if ($form->validate()) {
             $table = new SortableTable(
                 'tracking_access_overview',
-                ['MySpace','getNumberOfRrackingAccessOverview'],
-                ['MySpace','getUserDataAccessTrackingOverview'],
+                ['MySpace', 'getNumberOfRrackingAccessOverview'],
+                ['MySpace', 'getUserDataAccessTrackingOverview'],
                 0
             );
             $table->additional_parameters = $form->exportValues();
@@ -2938,7 +2938,7 @@ 
                     " : "
                         u.lastname AS col2,
                         u.firstname AS col3,
-                " ) . "
+                " )."
                 a.logout_course_date,
                 c.title,
                 c.code,
@@ -2949,7 +2949,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 ";
@@ -3010,14 +3010,14 @@ 
 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){
-            $end_date = add_day_to( $end_date );
+        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'";
         }
@@ -3025,10 +3025,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);
@@ -3046,7 +3046,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;
@@ -3106,7 +3106,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";
@@ -3125,7 +3125,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) {
@@ -3150,18 +3150,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', mktime () - $i * 3600 * 24)] = 0;
+        $main_day[date('d-m-Y', mktime() - $i * 3600 * 24)] = 0;
     }
     for ($i = $last_months; $i >= 0; $i--) {
-        $main_month_year[date ('m-Y', mktime () - $i * 30 * 3600 * 24)] = 0;
+        $main_month_year[date('m-Y', mktime() - $i * 30 * 3600 * 24)] = 0;
     }
 
     $i = 0;
@@ -3197,7 +3197,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');
@@ -3205,7 +3205,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);
@@ -3214,9 +3214,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;
@@ -3245,7 +3245,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 */
@@ -3262,7 +3262,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
                 )
             );
@@ -3304,7 +3304,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
                 )
             );
@@ -3323,15 +3323,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/notification.lib.php

Doc Comments +1 added lines, -1 removed lines

@@ -219,7 +219,7 @@
      * @param array	    $user_list recipients: user list of ids
      * @param string	$title
      * @param string	$content
-     * @param array	    $sender_info
+     * @param array	    $senderInfo
      * result of api_get_user_info() or GroupPortalManager:get_group_data()
      */
     public function save_notification(

Spacing +3 added lines, -3 removed lines

@@ -355,7 +355,7 @@ 
                 $newMessageText = '';
                 $linkToNewMessage = Display::url(
                     get_lang('SeeMessage'),
-                    api_get_path(WEB_CODE_PATH) . 'messages/inbox.php'
+                    api_get_path(WEB_CODE_PATH).'messages/inbox.php'
                 );
                 break;
             case self::NOTIFICATION_TYPE_MESSAGE:
@@ -370,7 +370,7 @@ 
                 }
                 $linkToNewMessage = Display::url(
                     get_lang('SeeMessage'),
-                    api_get_path(WEB_CODE_PATH) . 'messages/inbox.php'
+                    api_get_path(WEB_CODE_PATH).'messages/inbox.php'
                 );
                 break;
             case self::NOTIFICATION_TYPE_INVITATION:
@@ -385,7 +385,7 @@ 
                 }
                 $linkToNewMessage = Display::url(
                     get_lang('SeeInvitation'),
-                    api_get_path(WEB_CODE_PATH) . 'social/invitations.php'
+                    api_get_path(WEB_CODE_PATH).'social/invitations.php'
                 );
                 break;
             case self::NOTIFICATION_TYPE_GROUP:

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

Doc Comments +7 added lines, -7 removed lines

@@ -306,7 +306,7 @@ 
 	/**

 	* gets the current debug data for this instance

 	*

-	* @return   debug data

+	* @return   string data

 	* @access   public

 	*/

 	function &getDebug() {

@@ -319,7 +319,7 @@ 
 	* gets the current debug data for this instance as an XML comment

 	* this may change the contents of the debug data

 	*

-	* @return   debug data as an XML comment

+	* @return   string data as an XML comment

 	* @access   public

 	*/

 	function &getDebugAsXMLComment() {

@@ -352,7 +352,7 @@ 
 	/**

 	* returns error string if present

 	*

-	* @return   mixed error string or false

+	* @return   string|false error string or false

 	* @access   public

 	*/

 	function getError(){

@@ -365,7 +365,7 @@ 
 	/**

 	* sets error string

 	*

-	* @return   boolean $string error string

+	* @return   boolean|null $string error string

 	* @access   private

 	*/

 	function setError($str){

@@ -801,7 +801,7 @@ 
     * returns false, if not prefixed

     *

     * @param string $str The prefixed string

-    * @return mixed The prefix or false if there is no prefix

+    * @return string|false The prefix or false if there is no prefix

     * @access public

     */

 	function getPrefix($str){

@@ -832,7 +832,7 @@ 
     * or false if no prefixes registered for the given namespace

     *

     * @param string $ns The namespace

-    * @return mixed The prefix, false if the namespace has no prefixes

+    * @return string The prefix, false if the namespace has no prefixes

     * @access public

     */

 	function getPrefixFromNamespace($ns) {

@@ -898,7 +898,7 @@ 
 *

 * @param    int $timestamp Unix time stamp

 * @param	boolean $utc Whether the time stamp is UTC or local

-* @return	mixed ISO 8601 date string or false

+* @return	string|false ISO 8601 date string or false

 * @access   public

 */

 function timestamp_to_iso8601($timestamp,$utc=true){

Spacing +115 added lines, -115 removed lines

@@ -183,26 +183,26 @@ 
 	*/

 	var $typemap = array(

 	'http://www.w3.org/2001/XMLSchema' => array(

-		'string'=>'string','boolean'=>'boolean','float'=>'double','double'=>'double','decimal'=>'double',

-		'duration'=>'','dateTime'=>'string','time'=>'string','date'=>'string','gYearMonth'=>'',

-		'gYear'=>'','gMonthDay'=>'','gDay'=>'','gMonth'=>'','hexBinary'=>'string','base64Binary'=>'string',

+		'string'=>'string', 'boolean'=>'boolean', 'float'=>'double', 'double'=>'double', 'decimal'=>'double',

+		'duration'=>'', 'dateTime'=>'string', 'time'=>'string', 'date'=>'string', 'gYearMonth'=>'',

+		'gYear'=>'', 'gMonthDay'=>'', 'gDay'=>'', 'gMonth'=>'', 'hexBinary'=>'string', 'base64Binary'=>'string',

 		// abstract "any" types

-		'anyType'=>'string','anySimpleType'=>'string',

+		'anyType'=>'string', 'anySimpleType'=>'string',

 		// derived datatypes

-		'normalizedString'=>'string','token'=>'string','language'=>'','NMTOKEN'=>'','NMTOKENS'=>'','Name'=>'','NCName'=>'','ID'=>'',

-		'IDREF'=>'','IDREFS'=>'','ENTITY'=>'','ENTITIES'=>'','integer'=>'integer','nonPositiveInteger'=>'integer',

-		'negativeInteger'=>'integer','long'=>'integer','int'=>'integer','short'=>'integer','byte'=>'integer','nonNegativeInteger'=>'integer',

-		'unsignedLong'=>'','unsignedInt'=>'','unsignedShort'=>'','unsignedByte'=>'','positiveInteger'=>''),

+		'normalizedString'=>'string', 'token'=>'string', 'language'=>'', 'NMTOKEN'=>'', 'NMTOKENS'=>'', 'Name'=>'', 'NCName'=>'', 'ID'=>'',

+		'IDREF'=>'', 'IDREFS'=>'', 'ENTITY'=>'', 'ENTITIES'=>'', 'integer'=>'integer', 'nonPositiveInteger'=>'integer',

+		'negativeInteger'=>'integer', 'long'=>'integer', 'int'=>'integer', 'short'=>'integer', 'byte'=>'integer', 'nonNegativeInteger'=>'integer',

+		'unsignedLong'=>'', 'unsignedInt'=>'', 'unsignedShort'=>'', 'unsignedByte'=>'', 'positiveInteger'=>''),

 	'http://www.w3.org/2000/10/XMLSchema' => array(

-		'i4'=>'','int'=>'integer','boolean'=>'boolean','string'=>'string','double'=>'double',

-		'float'=>'double','dateTime'=>'string',

-		'timeInstant'=>'string','base64Binary'=>'string','base64'=>'string','ur-type'=>'array'),

+		'i4'=>'', 'int'=>'integer', 'boolean'=>'boolean', 'string'=>'string', 'double'=>'double',

+		'float'=>'double', 'dateTime'=>'string',

+		'timeInstant'=>'string', 'base64Binary'=>'string', 'base64'=>'string', 'ur-type'=>'array'),

 	'http://www.w3.org/1999/XMLSchema' => array(

-		'i4'=>'','int'=>'integer','boolean'=>'boolean','string'=>'string','double'=>'double',

-		'float'=>'double','dateTime'=>'string',

-		'timeInstant'=>'string','base64Binary'=>'string','base64'=>'string','ur-type'=>'array'),

+		'i4'=>'', 'int'=>'integer', 'boolean'=>'boolean', 'string'=>'string', 'double'=>'double',

+		'float'=>'double', 'dateTime'=>'string',

+		'timeInstant'=>'string', 'base64Binary'=>'string', 'base64'=>'string', 'ur-type'=>'array'),

 	'http://soapinterop.org/xsd' => array('SOAPStruct'=>'struct'),

-	'http://schemas.xmlsoap.org/soap/encoding/' => array('base64'=>'string','array'=>'array','Array'=>'array'),

+	'http://schemas.xmlsoap.org/soap/encoding/' => array('base64'=>'string', 'array'=>'array', 'Array'=>'array'),

     'http://xml.apache.org/xml-soap' => array('Map')

 	);

 

@@ -214,8 +214,8 @@ 
 	* @deprecated

 	* @see	expandEntities

 	*/

-	var $xmlEntities = array('quot' => '"','amp' => '&',

-		'lt' => '<','gt' => '>','apos' => "'");

+	var $xmlEntities = array('quot' => '"', 'amp' => '&',

+		'lt' => '<', 'gt' => '>', 'apos' => "'");

 

 	/**

 	* constructor

@@ -272,7 +272,7 @@ 
 	* @param    string $string debug data

 	* @access   private

 	*/

-	function debug($string){

+	function debug($string) {

 		if ($this->debugLevel > 0) {

 			$this->appendDebug($this->getmicrotime().' '.get_class($this).": $string\n");

 		}

@@ -284,7 +284,7 @@ 
 	* @param    string $string debug data

 	* @access   public

 	*/

-	function appendDebug($string){

+	function appendDebug($string) {

 		if ($this->debugLevel > 0) {

 			// it would be nice to use a memory stream here to use

 			// memory more efficiently

@@ -328,7 +328,7 @@ 
 		while (strpos($this->debug_str, '--')) {

 			$this->debug_str = str_replace('--', '- -', $this->debug_str);

 		}

-		$ret = "<!--\n" . $this->debug_str . "\n-->";

+		$ret = "<!--\n".$this->debug_str."\n-->";

     	return $ret;

 	}

 

@@ -355,8 +355,8 @@ 
 	* @return   mixed error string or false

 	* @access   public

 	*/

-	function getError(){

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

+	function getError() {

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

 			return $this->error_str;

 		}

 		return false;

@@ -368,7 +368,7 @@ 
 	* @return   boolean $string error string

 	* @access   private

 	*/

-	function setError($str){

+	function setError($str) {

 		$this->error_str = $str;

 	}

 

@@ -404,12 +404,12 @@ 
 	* @return	string	The serialized element, possibly with child elements

     * @access	public

 	*/

-	function serialize_val($val,$name=false,$type=false,$name_ns=false,$type_ns=false,$attributes=false,$use='encoded',$soapval=false) {

+	function serialize_val($val, $name = false, $type = false, $name_ns = false, $type_ns = false, $attributes = false, $use = 'encoded', $soapval = false) {

 		$this->debug("in serialize_val: name=$name, type=$type, name_ns=$name_ns, type_ns=$type_ns, use=$use, soapval=$soapval");

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

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

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

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

 

-    	if (is_object($val) && get_class($val) == 'soapval' && (! $soapval)) {

+    	if (is_object($val) && get_class($val) == 'soapval' && (!$soapval)) {

     		$this->debug("serialize_val: serialize soapval");

         	$xml = $val->serialize($use);

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

@@ -419,30 +419,30 @@ 
         }

 		// force valid name if necessary

 		if (is_numeric($name)) {

-			$name = '__numeric_' . $name;

-		} elseif (! $name) {

+			$name = '__numeric_'.$name;

+		} elseif (!$name) {

 			$name = 'noname';

 		}

 		// if name has ns, add ns prefix to name

 		$xmlns = '';

-        if($name_ns){

-			$prefix = 'nu'.rand(1000,9999);

+        if ($name_ns) {

+			$prefix = 'nu'.rand(1000, 9999);

 			$name = $prefix.':'.$name;

 			$xmlns .= " xmlns:$prefix=\"$name_ns\"";

 		}

 		// if type is prefixed, create type prefix

-		if($type_ns != '' && $type_ns == $this->namespaces['xsd']){

+		if ($type_ns != '' && $type_ns == $this->namespaces['xsd']) {

 			// need to fix this. shouldn't default to xsd if no ns specified

 		    // w/o checking against typemap

 			$type_prefix = 'xsd';

-		} elseif($type_ns){

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

+		} elseif ($type_ns) {

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

 			$xmlns .= " xmlns:$type_prefix=\"$type_ns\"";

 		}

 		// serialize attributes if present

 		$atts = '';

-		if($attributes){

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

+		if ($attributes) {

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

 				$atts .= " $k=\"".$this->expandEntities($v).'"';

 			}

 		}

@@ -466,12 +466,12 @@ 
         	}

 		}

         // serialize if an xsd built-in primitive type

-        if($type != '' && isset($this->typemap[$this->XMLSchemaVersion][$type])){

+        if ($type != '' && isset($this->typemap[$this->XMLSchemaVersion][$type])) {

     		$this->debug("serialize_val: serialize xsd built-in primitive type");

         	if (is_bool($val)) {

         		if ($type == 'boolean') {

 	        		$val = $val ? 'true' : 'false';

-	        	} elseif (! $val) {

+	        	} elseif (!$val) {

 	        		$val = 0;

 	        	}

 			} else if (is_string($val)) {

@@ -489,12 +489,12 @@ 
         }

 		// detect type and serialize

 		$xml = '';

-		switch(true) {

+		switch (true) {

 			case (is_bool($val) || $type == 'boolean'):

 		   		$this->debug("serialize_val: serialize boolean");

         		if ($type == 'boolean') {

 	        		$val = $val ? 'true' : 'false';

-	        	} elseif (! $val) {

+	        	} elseif (!$val) {

 	        		$val = 0;

 	        	}

 				if ($use == 'literal') {

@@ -511,7 +511,7 @@ 
 					$xml .= "<$name$xmlns xsi:type=\"xsd:int\"$atts>$val</$name>";

 				}

 				break;

-			case (is_float($val)|| is_double($val) || $type == 'float'):

+			case (is_float($val) || is_double($val) || $type == 'float'):

 		   		$this->debug("serialize_val: serialize float");

 				if ($use == 'literal') {

 					$xml .= "<$name$xmlns$atts>$val</$name>";

@@ -536,17 +536,17 @@ 
 					$this->appendDebug($val->getDebug());

 					$val->clearDebug();

 		        } else {

-					if (! $name) {

+					if (!$name) {

 						$name = get_class($val);

 						$this->debug("In serialize_val, used class name $name as element name");

 					} else {

-						$this->debug("In serialize_val, do not override name $name for element name for class " . get_class($val));

+						$this->debug("In serialize_val, do not override name $name for element name for class ".get_class($val));

 					}

-					foreach(get_object_vars($val) as $k => $v){

-						$pXml = isset($pXml) ? $pXml.$this->serialize_val($v,$k,false,false,false,false,$use) : $this->serialize_val($v,$k,false,false,false,false,$use);

+					foreach (get_object_vars($val) as $k => $v) {

+						$pXml = isset($pXml) ? $pXml.$this->serialize_val($v, $k, false, false, false, false, $use) : $this->serialize_val($v, $k, false, false, false, false, $use);

 					}

 				}

-				if(isset($type) && isset($type_prefix)){

+				if (isset($type) && isset($type_prefix)) {

 					$type_str = " xsi:type=\"$type_prefix:$type\"";

 				} else {

 					$type_str = '';

@@ -561,12 +561,12 @@ 
 			case (is_array($val) || $type):

 				// detect if struct or array

 				$valueType = $this->isArraySimpleOrStruct($val);

-                if($valueType=='arraySimple' || preg_match('/^ArrayOf/',$type)){

+                if ($valueType == 'arraySimple' || preg_match('/^ArrayOf/', $type)) {

 			   		$this->debug("serialize_val: serialize array");

 					$i = 0;

-					if(is_array($val) && count($val)> 0){

-						foreach($val as $v){

-	                    	if(is_object($v) && get_class($v) ==  'soapval'){

+					if (is_array($val) && count($val) > 0) {

+						foreach ($val as $v) {

+	                    	if (is_object($v) && get_class($v) == 'soapval') {

 								$tt_ns = $v->type_ns;

 								$tt = $v->type;

 							} elseif (is_array($v)) {

@@ -576,26 +576,26 @@ 
 	                        }

 							$array_types[$tt] = 1;

 							// TODO: for literal, the name should be $name

-							$xml .= $this->serialize_val($v,'item',false,false,false,false,$use);

+							$xml .= $this->serialize_val($v, 'item', false, false, false, false, $use);

 							++$i;

 						}

-						if(count($array_types) > 1){

+						if (count($array_types) > 1) {

 							$array_typename = 'xsd:anyType';

-						} elseif(isset($tt) && isset($this->typemap[$this->XMLSchemaVersion][$tt])) {

+						} elseif (isset($tt) && isset($this->typemap[$this->XMLSchemaVersion][$tt])) {

 							if ($tt == 'integer') {

 								$tt = 'int';

 							}

 							$array_typename = 'xsd:'.$tt;

-						} elseif(isset($tt) && $tt == 'arraySimple'){

+						} elseif (isset($tt) && $tt == 'arraySimple') {

 							$array_typename = 'SOAP-ENC:Array';

-						} elseif(isset($tt) && $tt == 'arrayStruct'){

+						} elseif (isset($tt) && $tt == 'arrayStruct') {

 							$array_typename = 'unnamed_struct_use_soapval';

 						} else {

 							// if type is prefixed, create type prefix

-							if ($tt_ns != '' && $tt_ns == $this->namespaces['xsd']){

-								 $array_typename = 'xsd:' . $tt;

+							if ($tt_ns != '' && $tt_ns == $this->namespaces['xsd']) {

+								 $array_typename = 'xsd:'.$tt;

 							} elseif ($tt_ns) {

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

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

 								$array_typename = "$tt_prefix:$tt";

 								$xmlns .= " xmlns:$tt_prefix=\"$tt_ns\"";

 							} else {

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

 					// got a struct

 			   		$this->debug("serialize_val: serialize struct");

-					if(isset($type) && isset($type_prefix)){

+					if (isset($type) && isset($type_prefix)) {

 						$type_str = " xsi:type=\"$type_prefix:$type\"";

 					} else {

 						$type_str = '';

@@ -635,15 +635,15 @@ 
 					} else {

 						$xml .= "<$name$xmlns$type_str$atts>";

 					}

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

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

 						// Apache Map

 						if ($type == 'Map' && $type_ns == 'http://xml.apache.org/xml-soap') {

 							$xml .= '<item>';

-							$xml .= $this->serialize_val($k,'key',false,false,false,false,$use);

-							$xml .= $this->serialize_val($v,'value',false,false,false,false,$use);

+							$xml .= $this->serialize_val($k, 'key', false, false, false, false, $use);

+							$xml .= $this->serialize_val($v, 'value', false, false, false, false, $use);

 							$xml .= '</item>';

 						} else {

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

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

 						}

 					}

 					$xml .= "</$name>";

@@ -670,12 +670,12 @@ 
     * @return string the message

     * @access public

     */

-    function serializeEnvelope($body,$headers=false,$namespaces=array(),$style='rpc',$use='encoded',$encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'){

+    function serializeEnvelope($body, $headers = false, $namespaces = array(), $style = 'rpc', $use = 'encoded', $encodingStyle = 'http://schemas.xmlsoap.org/soap/encoding/') {

     // TODO: add an option to automatically run utf8_encode on $body and $headers

     // if $this->soap_defencoding is UTF-8.  Not doing this automatically allows

     // one to send arbitrary UTF-8 characters, not just characters that map to ISO-8859-1

 

-	$this->debug("In serializeEnvelope length=" . strlen($body) . " body (max 1000 characters)=" . substr($body, 0, 1000) . " style=$style use=$use encodingStyle=$encodingStyle");

+	$this->debug("In serializeEnvelope length=".strlen($body)." body (max 1000 characters)=".substr($body, 0, 1000)." style=$style use=$use encodingStyle=$encodingStyle");

 	$this->debug("headers:");

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

 	$this->debug("namespaces:");

@@ -683,15 +683,15 @@ 
 

 	// serialize namespaces

     $ns_string = '';

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

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

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

 	}

-	if($encodingStyle) {

+	if ($encodingStyle) {

 		$ns_string = " SOAP-ENV:encodingStyle=\"$encodingStyle\"$ns_string";

 	}

 

 	// serialize headers

-	if($headers){

+	if ($headers) {

 		if (is_array($headers)) {

 			$xml = '';

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

@@ -708,7 +708,7 @@ 
 	}

 	// serialize envelope

 	return

-	'<?xml version="1.0" encoding="'.$this->soap_defencoding .'"?'.">".

+	'<?xml version="1.0" encoding="'.$this->soap_defencoding.'"?'.">".

 	'<SOAP-ENV:Envelope'.$ns_string.">".

 	$headers.

 	"<SOAP-ENV:Body>".

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

 	 * @deprecated

 	 */

-    function formatDump($str){

+    function formatDump($str) {

 		$str = htmlspecialchars($str);

 		return nl2br($str);

     }

@@ -737,7 +737,7 @@ 
 	* @return	string contracted qname

 	* @access   private

 	*/

-	function contractQname($qname){

+	function contractQname($qname) {

 		// get element namespace

 		//$this->xdebug("Contract $qname");

 		if (strrpos($qname, ':')) {

@@ -747,7 +747,7 @@ 
 			$ns = substr($qname, 0, strrpos($qname, ':'));

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

 			if ($p) {

-				return $p . ':' . $name;

+				return $p.':'.$name;

 			}

 			return $qname;

 		} else {

@@ -762,14 +762,14 @@ 
 	* @return	string expanded qname

 	* @access   private

 	*/

-	function expandQname($qname){

+	function expandQname($qname) {

 		// get element prefix

-		if(strpos($qname,':') && !preg_match('/^http:\/\//',$qname)){

+		if (strpos($qname, ':') && !preg_match('/^http:\/\//', $qname)) {

 			// get unqualified name

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

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

 			// get ns prefix

-			$prefix = substr($qname,0,strpos($qname,':'));

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

+			$prefix = substr($qname, 0, strpos($qname, ':'));

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

 				return $this->namespaces[$prefix].':'.$name;

 			} else {

 				return $qname;

@@ -787,10 +787,10 @@ 
     * @return string The local part

     * @access public

     */

-	function getLocalPart($str){

-		if($sstr = strrchr($str,':')){

+	function getLocalPart($str) {

+		if ($sstr = strrchr($str, ':')) {

 			// get unqualified name

-			return substr( $sstr, 1 );

+			return substr($sstr, 1);

 		} else {

 			return $str;

 		}

@@ -804,10 +804,10 @@ 
     * @return mixed The prefix or false if there is no prefix

     * @access public

     */

-	function getPrefix($str){

-		if($pos = strrpos($str,':')){

+	function getPrefix($str) {

+		if ($pos = strrpos($str, ':')) {

 			// get prefix

-			return substr($str,0,$pos);

+			return substr($str, 0, $pos);

 		}

 		return false;

 	}

@@ -819,7 +819,7 @@ 
     * @return mixed The namespace, false if no namespace has the specified prefix

     * @access public

     */

-	function getNamespaceFromPrefix($prefix){

+	function getNamespaceFromPrefix($prefix) {

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

 			return $this->namespaces[$prefix];

 		}

@@ -860,7 +860,7 @@ 
 			$sec = time();

 			$usec = 0;

 		}

-		return strftime('%Y-%m-%d %H:%M:%S', $sec) . '.' . sprintf('%06d', $usec);

+		return strftime('%Y-%m-%d %H:%M:%S', $sec).'.'.sprintf('%06d', $usec);

 	}

 

 	/**

@@ -901,31 +901,31 @@ 
 * @return	mixed ISO 8601 date string or false

 * @access   public

 */

-function timestamp_to_iso8601($timestamp,$utc=true){

-	$datestr = date('Y-m-d\TH:i:sO',$timestamp);

+function timestamp_to_iso8601($timestamp, $utc = true) {

+	$datestr = date('Y-m-d\TH:i:sO', $timestamp);

 	$pos = strrpos($datestr, "+");

 	if ($pos === FALSE) {

 		$pos = strrpos($datestr, "-");

 	}

 	if ($pos !== FALSE) {

 		if (strlen($datestr) == $pos + 5) {

-			$datestr = substr($datestr, 0, $pos + 3) . ':' . substr($datestr, -2);

+			$datestr = substr($datestr, 0, $pos + 3).':'.substr($datestr, -2);

 		}

 	}

-	if($utc){

+	if ($utc) {

 		$pattern = '/'.

-		'([0-9]{4})-'.	// centuries & years CCYY-

-		'([0-9]{2})-'.	// months MM-

-		'([0-9]{2})'.	// days DD

-		'T'.			// separator T

-		'([0-9]{2}):'.	// hours hh:

-		'([0-9]{2}):'.	// minutes mm:

-		'([0-9]{2})(\.[0-9]*)?'. // seconds ss.ss...

-		'(Z|[+\-][0-9]{2}:?[0-9]{2})?'. // Z to indicate UTC, -/+HH:MM:SS.SS... for local tz's

+		'([0-9]{4})-'.// centuries & years CCYY-

+		'([0-9]{2})-'.// months MM-

+		'([0-9]{2})'.// days DD

+		'T'.// separator T

+		'([0-9]{2}):'.// hours hh:

+		'([0-9]{2}):'.// minutes mm:

+		'([0-9]{2})(\.[0-9]*)?'.// seconds ss.ss...

+		'(Z|[+\-][0-9]{2}:?[0-9]{2})?'.// Z to indicate UTC, -/+HH:MM:SS.SS... for local tz's

 		'/';

 

-		if(preg_match($pattern,$datestr,$regs)){

-			return sprintf('%04d-%02d-%02dT%02d:%02d:%02dZ',$regs[1],$regs[2],$regs[3],$regs[4],$regs[5],$regs[6]);

+		if (preg_match($pattern, $datestr, $regs)) {

+			return sprintf('%04d-%02d-%02dT%02d:%02d:%02dZ', $regs[1], $regs[2], $regs[3], $regs[4], $regs[5], $regs[6]);

 		}

 		return false;

 	} else {

@@ -940,27 +940,27 @@ 
 * @return	mixed Unix timestamp (int) or false

 * @access   public

 */

-function iso8601_to_timestamp($datestr){

+function iso8601_to_timestamp($datestr) {

 	$pattern = '/'.

-	'([0-9]{4})-'.	// centuries & years CCYY-

-	'([0-9]{2})-'.	// months MM-

-	'([0-9]{2})'.	// days DD

-	'T'.			// separator T

-	'([0-9]{2}):'.	// hours hh:

-	'([0-9]{2}):'.	// minutes mm:

-	'([0-9]{2})(\.[0-9]+)?'. // seconds ss.ss...

-	'(Z|[+\-][0-9]{2}:?[0-9]{2})?'. // Z to indicate UTC, -/+HH:MM:SS.SS... for local tz's

+	'([0-9]{4})-'.// centuries & years CCYY-

+	'([0-9]{2})-'.// months MM-

+	'([0-9]{2})'.// days DD

+	'T'.// separator T

+	'([0-9]{2}):'.// hours hh:

+	'([0-9]{2}):'.// minutes mm:

+	'([0-9]{2})(\.[0-9]+)?'.// seconds ss.ss...

+	'(Z|[+\-][0-9]{2}:?[0-9]{2})?'.// Z to indicate UTC, -/+HH:MM:SS.SS... for local tz's

 	'/';

-	if(preg_match($pattern,$datestr,$regs)){

+	if (preg_match($pattern, $datestr, $regs)) {

 		// not utc

-		if($regs[8] != 'Z'){

-			$op = substr($regs[8],0,1);

-			$h = substr($regs[8],1,2);

-			$m = substr($regs[8],strlen($regs[8])-2,2);

-			if($op == '-'){

+		if ($regs[8] != 'Z') {

+			$op = substr($regs[8], 0, 1);

+			$h = substr($regs[8], 1, 2);

+			$m = substr($regs[8], strlen($regs[8]) - 2, 2);

+			if ($op == '-') {

 				$regs[4] = $regs[4] + $h;

 				$regs[5] = $regs[5] + $m;

-			} elseif($op == '+'){

+			} elseif ($op == '+') {

 				$regs[4] = $regs[4] - $h;

 				$regs[5] = $regs[5] - $m;

 			}

Indentation +845 added lines, -845 removed lines

@@ -83,809 +83,809 @@ 
 * @access   public

 */

 class nusoap_base {

-	/**

-	 * Identification for HTTP headers.

-	 *

-	 * @var string

-	 * @access private

-	 */

-	var $title = 'NuSOAP';

-	/**

-	 * Version for HTTP headers.

-	 *

-	 * @var string

-	 * @access private

-	 */

-	var $version = '0.9.5';

-	/**

-	 * CVS revision for HTTP headers.

-	 *

-	 * @var string

-	 * @access private

-	 */

-	var $revision = '$Revision: 1.56 $';

+    /**

+     * Identification for HTTP headers.

+     *

+     * @var string

+     * @access private

+     */

+    var $title = 'NuSOAP';

+    /**

+     * Version for HTTP headers.

+     *

+     * @var string

+     * @access private

+     */

+    var $version = '0.9.5';

+    /**

+     * CVS revision for HTTP headers.

+     *

+     * @var string

+     * @access private

+     */

+    var $revision = '$Revision: 1.56 $';

     /**

      * Current error string (manipulated by getError/setError)

-	 *

-	 * @var string

-	 * @access private

-	 */

-	var $error_str = '';

+     *

+     * @var string

+     * @access private

+     */

+    var $error_str = '';

     /**

      * Current debug string (manipulated by debug/appendDebug/clearDebug/getDebug/getDebugAsXMLComment)

-	 *

-	 * @var string

-	 * @access private

-	 */

+     *

+     * @var string

+     * @access private

+     */

     var $debug_str = '';

     /**

-	 * toggles automatic encoding of special characters as entities

-	 * (should always be true, I think)

-	 *

-	 * @var boolean

-	 * @access private

-	 */

-	var $charencoding = true;

-	/**

-	 * the debug level for this instance

-	 *

-	 * @var	integer

-	 * @access private

-	 */

-	var $debugLevel;

-

-    /**

-	* set schema version

-	*

-	* @var      string

-	* @access   public

-	*/

-	var $XMLSchemaVersion = 'http://www.w3.org/2001/XMLSchema';

-

-    /**

-	* charset encoding for outgoing messages

-	*

-	* @var      string

-	* @access   public

-	*/

+     * toggles automatic encoding of special characters as entities

+     * (should always be true, I think)

+     *

+     * @var boolean

+     * @access private

+     */

+    var $charencoding = true;

+    /**

+     * the debug level for this instance

+     *

+     * @var	integer

+     * @access private

+     */

+    var $debugLevel;

+

+    /**

+     * set schema version

+     *

+     * @var      string

+     * @access   public

+     */

+    var $XMLSchemaVersion = 'http://www.w3.org/2001/XMLSchema';

+

+    /**

+     * charset encoding for outgoing messages

+     *

+     * @var      string

+     * @access   public

+     */

     var $soap_defencoding = 'ISO-8859-1';

-	//var $soap_defencoding = 'UTF-8';

-

-	/**

-	* namespaces in an array of prefix => uri

-	*

-	* this is "seeded" by a set of constants, but it may be altered by code

-	*

-	* @var      array

-	* @access   public

-	*/

-	var $namespaces = array(

-		'SOAP-ENV' => 'http://schemas.xmlsoap.org/soap/envelope/',

-		'xsd' => 'http://www.w3.org/2001/XMLSchema',

-		'xsi' => 'http://www.w3.org/2001/XMLSchema-instance',

-		'SOAP-ENC' => 'http://schemas.xmlsoap.org/soap/encoding/'

-		);

-

-	/**

-	* namespaces used in the current context, e.g. during serialization

-	*

-	* @var      array

-	* @access   private

-	*/

-	var $usedNamespaces = array();

-

-	/**

-	* XML Schema types in an array of uri => (array of xml type => php type)

-	* is this legacy yet?

-	* no, this is used by the nusoap_xmlschema class to verify type => namespace mappings.

-	* @var      array

-	* @access   public

-	*/

-	var $typemap = array(

-	'http://www.w3.org/2001/XMLSchema' => array(

-		'string'=>'string','boolean'=>'boolean','float'=>'double','double'=>'double','decimal'=>'double',

-		'duration'=>'','dateTime'=>'string','time'=>'string','date'=>'string','gYearMonth'=>'',

-		'gYear'=>'','gMonthDay'=>'','gDay'=>'','gMonth'=>'','hexBinary'=>'string','base64Binary'=>'string',

-		// abstract "any" types

-		'anyType'=>'string','anySimpleType'=>'string',

-		// derived datatypes

-		'normalizedString'=>'string','token'=>'string','language'=>'','NMTOKEN'=>'','NMTOKENS'=>'','Name'=>'','NCName'=>'','ID'=>'',

-		'IDREF'=>'','IDREFS'=>'','ENTITY'=>'','ENTITIES'=>'','integer'=>'integer','nonPositiveInteger'=>'integer',

-		'negativeInteger'=>'integer','long'=>'integer','int'=>'integer','short'=>'integer','byte'=>'integer','nonNegativeInteger'=>'integer',

-		'unsignedLong'=>'','unsignedInt'=>'','unsignedShort'=>'','unsignedByte'=>'','positiveInteger'=>''),

-	'http://www.w3.org/2000/10/XMLSchema' => array(

-		'i4'=>'','int'=>'integer','boolean'=>'boolean','string'=>'string','double'=>'double',

-		'float'=>'double','dateTime'=>'string',

-		'timeInstant'=>'string','base64Binary'=>'string','base64'=>'string','ur-type'=>'array'),

-	'http://www.w3.org/1999/XMLSchema' => array(

-		'i4'=>'','int'=>'integer','boolean'=>'boolean','string'=>'string','double'=>'double',

-		'float'=>'double','dateTime'=>'string',

-		'timeInstant'=>'string','base64Binary'=>'string','base64'=>'string','ur-type'=>'array'),

-	'http://soapinterop.org/xsd' => array('SOAPStruct'=>'struct'),

-	'http://schemas.xmlsoap.org/soap/encoding/' => array('base64'=>'string','array'=>'array','Array'=>'array'),

+    //var $soap_defencoding = 'UTF-8';

+

+    /**

+     * namespaces in an array of prefix => uri

+     *

+     * this is "seeded" by a set of constants, but it may be altered by code

+     *

+     * @var      array

+     * @access   public

+     */

+    var $namespaces = array(

+        'SOAP-ENV' => 'http://schemas.xmlsoap.org/soap/envelope/',

+        'xsd' => 'http://www.w3.org/2001/XMLSchema',

+        'xsi' => 'http://www.w3.org/2001/XMLSchema-instance',

+        'SOAP-ENC' => 'http://schemas.xmlsoap.org/soap/encoding/'

+        );

+

+    /**

+     * namespaces used in the current context, e.g. during serialization

+     *

+     * @var      array

+     * @access   private

+     */

+    var $usedNamespaces = array();

+

+    /**

+     * XML Schema types in an array of uri => (array of xml type => php type)

+     * is this legacy yet?

+     * no, this is used by the nusoap_xmlschema class to verify type => namespace mappings.

+     * @var      array

+     * @access   public

+     */

+    var $typemap = array(

+    'http://www.w3.org/2001/XMLSchema' => array(

+        'string'=>'string','boolean'=>'boolean','float'=>'double','double'=>'double','decimal'=>'double',

+        'duration'=>'','dateTime'=>'string','time'=>'string','date'=>'string','gYearMonth'=>'',

+        'gYear'=>'','gMonthDay'=>'','gDay'=>'','gMonth'=>'','hexBinary'=>'string','base64Binary'=>'string',

+        // abstract "any" types

+        'anyType'=>'string','anySimpleType'=>'string',

+        // derived datatypes

+        'normalizedString'=>'string','token'=>'string','language'=>'','NMTOKEN'=>'','NMTOKENS'=>'','Name'=>'','NCName'=>'','ID'=>'',

+        'IDREF'=>'','IDREFS'=>'','ENTITY'=>'','ENTITIES'=>'','integer'=>'integer','nonPositiveInteger'=>'integer',

+        'negativeInteger'=>'integer','long'=>'integer','int'=>'integer','short'=>'integer','byte'=>'integer','nonNegativeInteger'=>'integer',

+        'unsignedLong'=>'','unsignedInt'=>'','unsignedShort'=>'','unsignedByte'=>'','positiveInteger'=>''),

+    'http://www.w3.org/2000/10/XMLSchema' => array(

+        'i4'=>'','int'=>'integer','boolean'=>'boolean','string'=>'string','double'=>'double',

+        'float'=>'double','dateTime'=>'string',

+        'timeInstant'=>'string','base64Binary'=>'string','base64'=>'string','ur-type'=>'array'),

+    'http://www.w3.org/1999/XMLSchema' => array(

+        'i4'=>'','int'=>'integer','boolean'=>'boolean','string'=>'string','double'=>'double',

+        'float'=>'double','dateTime'=>'string',

+        'timeInstant'=>'string','base64Binary'=>'string','base64'=>'string','ur-type'=>'array'),

+    'http://soapinterop.org/xsd' => array('SOAPStruct'=>'struct'),

+    'http://schemas.xmlsoap.org/soap/encoding/' => array('base64'=>'string','array'=>'array','Array'=>'array'),

     'http://xml.apache.org/xml-soap' => array('Map')

-	);

-

-	/**

-	* XML entities to convert

-	*

-	* @var      array

-	* @access   public

-	* @deprecated

-	* @see	expandEntities

-	*/

-	var $xmlEntities = array('quot' => '"','amp' => '&',

-		'lt' => '<','gt' => '>','apos' => "'");

-

-	/**

-	* constructor

-	*

-	* @access	public

-	*/

-	function __construct() {

-		$this->debugLevel = $GLOBALS['_transient']['static']['nusoap_base']['globalDebugLevel'];

-	}

-

-	/**

-	* gets the global debug level, which applies to future instances

-	*

-	* @return	integer	Debug level 0-9, where 0 turns off

-	* @access	public

-	*/

-	function getGlobalDebugLevel() {

-		return $GLOBALS['_transient']['static']['nusoap_base']['globalDebugLevel'];

-	}

-

-	/**

-	* sets the global debug level, which applies to future instances

-	*

-	* @param	int	$level	Debug level 0-9, where 0 turns off

-	* @access	public

-	*/

-	function setGlobalDebugLevel($level) {

-		$GLOBALS['_transient']['static']['nusoap_base']['globalDebugLevel'] = $level;

-	}

-

-	/**

-	* gets the debug level for this instance

-	*

-	* @return	int	Debug level 0-9, where 0 turns off

-	* @access	public

-	*/

-	function getDebugLevel() {

-		return $this->debugLevel;

-	}

-

-	/**

-	* sets the debug level for this instance

-	*

-	* @param	int	$level	Debug level 0-9, where 0 turns off

-	* @access	public

-	*/

-	function setDebugLevel($level) {

-		$this->debugLevel = $level;

-	}

-

-	/**

-	* adds debug data to the instance debug string with formatting

-	*

-	* @param    string $string debug data

-	* @access   private

-	*/

-	function debug($string){

-		if ($this->debugLevel > 0) {

-			$this->appendDebug($this->getmicrotime().' '.get_class($this).": $string\n");

-		}

-	}

-

-	/**

-	* adds debug data to the instance debug string without formatting

-	*

-	* @param    string $string debug data

-	* @access   public

-	*/

-	function appendDebug($string){

-		if ($this->debugLevel > 0) {

-			// it would be nice to use a memory stream here to use

-			// memory more efficiently

-			$this->debug_str .= $string;

-		}

-	}

-

-	/**

-	* clears the current debug data for this instance

-	*

-	* @access   public

-	*/

-	function clearDebug() {

-		// it would be nice to use a memory stream here to use

-		// memory more efficiently

-		$this->debug_str = '';

-	}

-

-	/**

-	* gets the current debug data for this instance

-	*

-	* @return   debug data

-	* @access   public

-	*/

-	function &getDebug() {

-		// it would be nice to use a memory stream here to use

-		// memory more efficiently

-		return $this->debug_str;

-	}

-

-	/**

-	* gets the current debug data for this instance as an XML comment

-	* this may change the contents of the debug data

-	*

-	* @return   debug data as an XML comment

-	* @access   public

-	*/

-	function &getDebugAsXMLComment() {

-		// it would be nice to use a memory stream here to use

-		// memory more efficiently

-		while (strpos($this->debug_str, '--')) {

-			$this->debug_str = str_replace('--', '- -', $this->debug_str);

-		}

-		$ret = "<!--\n" . $this->debug_str . "\n-->";

-    	return $ret;

-	}

-

-	/**

-	* expands entities, e.g. changes '<' to '&lt;'.

-	*

-	* @param	string	$val	The string in which to expand entities.

-	* @access	private

-	*/

-	function expandEntities($val) {

-		if ($this->charencoding) {

-	    	$val = str_replace('&', '&amp;', $val);

-	    	$val = str_replace("'", '&apos;', $val);

-	    	$val = str_replace('"', '&quot;', $val);

-	    	$val = str_replace('<', '&lt;', $val);

-	    	$val = str_replace('>', '&gt;', $val);

-	    }

-	    return $val;

-	}

-

-	/**

-	* returns error string if present

-	*

-	* @return   mixed error string or false

-	* @access   public

-	*/

-	function getError(){

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

-			return $this->error_str;

-		}

-		return false;

-	}

-

-	/**

-	* sets error string

-	*

-	* @return   boolean $string error string

-	* @access   private

-	*/

-	function setError($str){

-		$this->error_str = $str;

-	}

-

-	/**

-	* detect if array is a simple array or a struct (associative array)

-	*

-	* @param	mixed	$val	The PHP array

-	* @return	string	(arraySimple|arrayStruct)

-	* @access	private

-	*/

-	function isArraySimpleOrStruct($val) {

+    );

+

+    /**

+     * XML entities to convert

+     *

+     * @var      array

+     * @access   public

+     * @deprecated

+     * @see	expandEntities

+     */

+    var $xmlEntities = array('quot' => '"','amp' => '&',

+        'lt' => '<','gt' => '>','apos' => "'");

+

+    /**

+     * constructor

+     *

+     * @access	public

+     */

+    function __construct() {

+        $this->debugLevel = $GLOBALS['_transient']['static']['nusoap_base']['globalDebugLevel'];

+    }

+

+    /**

+     * gets the global debug level, which applies to future instances

+     *

+     * @return	integer	Debug level 0-9, where 0 turns off

+     * @access	public

+     */

+    function getGlobalDebugLevel() {

+        return $GLOBALS['_transient']['static']['nusoap_base']['globalDebugLevel'];

+    }

+

+    /**

+     * sets the global debug level, which applies to future instances

+     *

+     * @param	int	$level	Debug level 0-9, where 0 turns off

+     * @access	public

+     */

+    function setGlobalDebugLevel($level) {

+        $GLOBALS['_transient']['static']['nusoap_base']['globalDebugLevel'] = $level;

+    }

+

+    /**

+     * gets the debug level for this instance

+     *

+     * @return	int	Debug level 0-9, where 0 turns off

+     * @access	public

+     */

+    function getDebugLevel() {

+        return $this->debugLevel;

+    }

+

+    /**

+     * sets the debug level for this instance

+     *

+     * @param	int	$level	Debug level 0-9, where 0 turns off

+     * @access	public

+     */

+    function setDebugLevel($level) {

+        $this->debugLevel = $level;

+    }

+

+    /**

+     * adds debug data to the instance debug string with formatting

+     *

+     * @param    string $string debug data

+     * @access   private

+     */

+    function debug($string){

+        if ($this->debugLevel > 0) {

+            $this->appendDebug($this->getmicrotime().' '.get_class($this).": $string\n");

+        }

+    }

+

+    /**

+     * adds debug data to the instance debug string without formatting

+     *

+     * @param    string $string debug data

+     * @access   public

+     */

+    function appendDebug($string){

+        if ($this->debugLevel > 0) {

+            // it would be nice to use a memory stream here to use

+            // memory more efficiently

+            $this->debug_str .= $string;

+        }

+    }

+

+    /**

+     * clears the current debug data for this instance

+     *

+     * @access   public

+     */

+    function clearDebug() {

+        // it would be nice to use a memory stream here to use

+        // memory more efficiently

+        $this->debug_str = '';

+    }

+

+    /**

+     * gets the current debug data for this instance

+     *

+     * @return   debug data

+     * @access   public

+     */

+    function &getDebug() {

+        // it would be nice to use a memory stream here to use

+        // memory more efficiently

+        return $this->debug_str;

+    }

+

+    /**

+     * gets the current debug data for this instance as an XML comment

+     * this may change the contents of the debug data

+     *

+     * @return   debug data as an XML comment

+     * @access   public

+     */

+    function &getDebugAsXMLComment() {

+        // it would be nice to use a memory stream here to use

+        // memory more efficiently

+        while (strpos($this->debug_str, '--')) {

+            $this->debug_str = str_replace('--', '- -', $this->debug_str);

+        }

+        $ret = "<!--\n" . $this->debug_str . "\n-->";

+        return $ret;

+    }

+

+    /**

+     * expands entities, e.g. changes '<' to '&lt;'.

+     *

+     * @param	string	$val	The string in which to expand entities.

+     * @access	private

+     */

+    function expandEntities($val) {

+        if ($this->charencoding) {

+            $val = str_replace('&', '&amp;', $val);

+            $val = str_replace("'", '&apos;', $val);

+            $val = str_replace('"', '&quot;', $val);

+            $val = str_replace('<', '&lt;', $val);

+            $val = str_replace('>', '&gt;', $val);

+        }

+        return $val;

+    }

+

+    /**

+     * returns error string if present

+     *

+     * @return   mixed error string or false

+     * @access   public

+     */

+    function getError(){

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

+            return $this->error_str;

+        }

+        return false;

+    }

+

+    /**

+     * sets error string

+     *

+     * @return   boolean $string error string

+     * @access   private

+     */

+    function setError($str){

+        $this->error_str = $str;

+    }

+

+    /**

+     * detect if array is a simple array or a struct (associative array)

+     *

+     * @param	mixed	$val	The PHP array

+     * @return	string	(arraySimple|arrayStruct)

+     * @access	private

+     */

+    function isArraySimpleOrStruct($val) {

         $keyList = array_keys($val);

-		foreach ($keyList as $keyListValue) {

-			if (!is_int($keyListValue)) {

-				return 'arrayStruct';

-			}

-		}

-		return 'arraySimple';

-	}

-

-	/**

-	* serializes PHP values in accordance w/ section 5. Type information is

-	* not serialized if $use == 'literal'.

-	*

-	* @param	mixed	$val	The value to serialize

-	* @param	string	$name	The name (local part) of the XML element

-	* @param	string	$type	The XML schema type (local part) for the element

-	* @param	string	$name_ns	The namespace for the name of the XML element

-	* @param	string	$type_ns	The namespace for the type of the element

-	* @param	array	$attributes	The attributes to serialize as name=>value pairs

-	* @param	string	$use	The WSDL "use" (encoded|literal)

-	* @param	boolean	$soapval	Whether this is called from soapval.

-	* @return	string	The serialized element, possibly with child elements

-    * @access	public

-	*/

-	function serialize_val($val,$name=false,$type=false,$name_ns=false,$type_ns=false,$attributes=false,$use='encoded',$soapval=false) {

-		$this->debug("in serialize_val: name=$name, type=$type, name_ns=$name_ns, type_ns=$type_ns, use=$use, soapval=$soapval");

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

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

-

-    	if (is_object($val) && get_class($val) == 'soapval' && (! $soapval)) {

-    		$this->debug("serialize_val: serialize soapval");

-        	$xml = $val->serialize($use);

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

-			$val->clearDebug();

-			$this->debug("serialize_val of soapval returning $xml");

-			return $xml;

+        foreach ($keyList as $keyListValue) {

+            if (!is_int($keyListValue)) {

+                return 'arrayStruct';

+            }

         }

-		// force valid name if necessary

-		if (is_numeric($name)) {

-			$name = '__numeric_' . $name;

-		} elseif (! $name) {

-			$name = 'noname';

-		}

-		// if name has ns, add ns prefix to name

-		$xmlns = '';

+        return 'arraySimple';

+    }

+

+    /**

+     * serializes PHP values in accordance w/ section 5. Type information is

+     * not serialized if $use == 'literal'.

+     *

+     * @param	mixed	$val	The value to serialize

+     * @param	string	$name	The name (local part) of the XML element

+     * @param	string	$type	The XML schema type (local part) for the element

+     * @param	string	$name_ns	The namespace for the name of the XML element

+     * @param	string	$type_ns	The namespace for the type of the element

+     * @param	array	$attributes	The attributes to serialize as name=>value pairs

+     * @param	string	$use	The WSDL "use" (encoded|literal)

+     * @param	boolean	$soapval	Whether this is called from soapval.

+     * @return	string	The serialized element, possibly with child elements

+     * @access	public

+     */

+    function serialize_val($val,$name=false,$type=false,$name_ns=false,$type_ns=false,$attributes=false,$use='encoded',$soapval=false) {

+        $this->debug("in serialize_val: name=$name, type=$type, name_ns=$name_ns, type_ns=$type_ns, use=$use, soapval=$soapval");

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

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

+

+        if (is_object($val) && get_class($val) == 'soapval' && (! $soapval)) {

+            $this->debug("serialize_val: serialize soapval");

+            $xml = $val->serialize($use);

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

+            $val->clearDebug();

+            $this->debug("serialize_val of soapval returning $xml");

+            return $xml;

+        }

+        // force valid name if necessary

+        if (is_numeric($name)) {

+            $name = '__numeric_' . $name;

+        } elseif (! $name) {

+            $name = 'noname';

+        }

+        // if name has ns, add ns prefix to name

+        $xmlns = '';

         if($name_ns){

-			$prefix = 'nu'.rand(1000,9999);

-			$name = $prefix.':'.$name;

-			$xmlns .= " xmlns:$prefix=\"$name_ns\"";

-		}

-		// if type is prefixed, create type prefix

-		if($type_ns != '' && $type_ns == $this->namespaces['xsd']){

-			// need to fix this. shouldn't default to xsd if no ns specified

-		    // w/o checking against typemap

-			$type_prefix = 'xsd';

-		} elseif($type_ns){

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

-			$xmlns .= " xmlns:$type_prefix=\"$type_ns\"";

-		}

-		// serialize attributes if present

-		$atts = '';

-		if($attributes){

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

-				$atts .= " $k=\"".$this->expandEntities($v).'"';

-			}

-		}

-		// serialize null value

-		if (is_null($val)) {

-    		$this->debug("serialize_val: serialize null");

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

-				// TODO: depends on minOccurs

-				$xml = "<$name$xmlns$atts/>";

-				$this->debug("serialize_val returning $xml");

-	        	return $xml;

-        	} else {

-				if (isset($type) && isset($type_prefix)) {

-					$type_str = " xsi:type=\"$type_prefix:$type\"";

-				} else {

-					$type_str = '';

-				}

-				$xml = "<$name$xmlns$type_str$atts xsi:nil=\"true\"/>";

-				$this->debug("serialize_val returning $xml");

-	        	return $xml;

-        	}

-		}

+            $prefix = 'nu'.rand(1000,9999);

+            $name = $prefix.':'.$name;

+            $xmlns .= " xmlns:$prefix=\"$name_ns\"";

+        }

+        // if type is prefixed, create type prefix

+        if($type_ns != '' && $type_ns == $this->namespaces['xsd']){

+            // need to fix this. shouldn't default to xsd if no ns specified

+            // w/o checking against typemap

+            $type_prefix = 'xsd';

+        } elseif($type_ns){

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

+            $xmlns .= " xmlns:$type_prefix=\"$type_ns\"";

+        }

+        // serialize attributes if present

+        $atts = '';

+        if($attributes){

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

+                $atts .= " $k=\"".$this->expandEntities($v).'"';

+            }

+        }

+        // serialize null value

+        if (is_null($val)) {

+            $this->debug("serialize_val: serialize null");

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

+                // TODO: depends on minOccurs

+                $xml = "<$name$xmlns$atts/>";

+                $this->debug("serialize_val returning $xml");

+                return $xml;

+            } else {

+                if (isset($type) && isset($type_prefix)) {

+                    $type_str = " xsi:type=\"$type_prefix:$type\"";

+                } else {

+                    $type_str = '';

+                }

+                $xml = "<$name$xmlns$type_str$atts xsi:nil=\"true\"/>";

+                $this->debug("serialize_val returning $xml");

+                return $xml;

+            }

+        }

         // serialize if an xsd built-in primitive type

         if($type != '' && isset($this->typemap[$this->XMLSchemaVersion][$type])){

-    		$this->debug("serialize_val: serialize xsd built-in primitive type");

-        	if (is_bool($val)) {

-        		if ($type == 'boolean') {

-	        		$val = $val ? 'true' : 'false';

-	        	} elseif (! $val) {

-	        		$val = 0;

-	        	}

-			} else if (is_string($val)) {

-				$val = $this->expandEntities($val);

-			}

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

-				$xml = "<$name$xmlns$atts>$val</$name>";

-				$this->debug("serialize_val returning $xml");

-	        	return $xml;

-        	} else {

-				$xml = "<$name$xmlns xsi:type=\"xsd:$type\"$atts>$val</$name>";

-				$this->debug("serialize_val returning $xml");

-	        	return $xml;

-        	}

+            $this->debug("serialize_val: serialize xsd built-in primitive type");

+            if (is_bool($val)) {

+                if ($type == 'boolean') {

+                    $val = $val ? 'true' : 'false';

+                } elseif (! $val) {

+                    $val = 0;

+                }

+            } else if (is_string($val)) {

+                $val = $this->expandEntities($val);

+            }

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

+                $xml = "<$name$xmlns$atts>$val</$name>";

+                $this->debug("serialize_val returning $xml");

+                return $xml;

+            } else {

+                $xml = "<$name$xmlns xsi:type=\"xsd:$type\"$atts>$val</$name>";

+                $this->debug("serialize_val returning $xml");

+                return $xml;

+            }

         }

-		// detect type and serialize

-		$xml = '';

-		switch(true) {

-			case (is_bool($val) || $type == 'boolean'):

-		   		$this->debug("serialize_val: serialize boolean");

-        		if ($type == 'boolean') {

-	        		$val = $val ? 'true' : 'false';

-	        	} elseif (! $val) {

-	        		$val = 0;

-	        	}

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

-					$xml .= "<$name$xmlns$atts>$val</$name>";

-				} else {

-					$xml .= "<$name$xmlns xsi:type=\"xsd:boolean\"$atts>$val</$name>";

-				}

-				break;

-			case (is_int($val) || is_long($val) || $type == 'int'):

-		   		$this->debug("serialize_val: serialize int");

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

-					$xml .= "<$name$xmlns$atts>$val</$name>";

-				} else {

-					$xml .= "<$name$xmlns xsi:type=\"xsd:int\"$atts>$val</$name>";

-				}

-				break;

-			case (is_float($val)|| is_double($val) || $type == 'float'):

-		   		$this->debug("serialize_val: serialize float");

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

-					$xml .= "<$name$xmlns$atts>$val</$name>";

-				} else {

-					$xml .= "<$name$xmlns xsi:type=\"xsd:float\"$atts>$val</$name>";

-				}

-				break;

-			case (is_string($val) || $type == 'string'):

-		   		$this->debug("serialize_val: serialize string");

-				$val = $this->expandEntities($val);

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

-					$xml .= "<$name$xmlns$atts>$val</$name>";

-				} else {

-					$xml .= "<$name$xmlns xsi:type=\"xsd:string\"$atts>$val</$name>";

-				}

-				break;

-			case is_object($val):

-		   		$this->debug("serialize_val: serialize object");

-		    	if (get_class($val) == 'soapval') {

-		    		$this->debug("serialize_val: serialize soapval object");

-		        	$pXml = $val->serialize($use);

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

-					$val->clearDebug();

-		        } else {

-					if (! $name) {

-						$name = get_class($val);

-						$this->debug("In serialize_val, used class name $name as element name");

-					} else {

-						$this->debug("In serialize_val, do not override name $name for element name for class " . get_class($val));

-					}

-					foreach(get_object_vars($val) as $k => $v){

-						$pXml = isset($pXml) ? $pXml.$this->serialize_val($v,$k,false,false,false,false,$use) : $this->serialize_val($v,$k,false,false,false,false,$use);

-					}

-				}

-				if(isset($type) && isset($type_prefix)){

-					$type_str = " xsi:type=\"$type_prefix:$type\"";

-				} else {

-					$type_str = '';

-				}

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

-					$xml .= "<$name$xmlns$atts>$pXml</$name>";

-				} else {

-					$xml .= "<$name$xmlns$type_str$atts>$pXml</$name>";

-				}

-				break;

-			case (is_array($val) || $type):

-				// detect if struct or array

-				$valueType = $this->isArraySimpleOrStruct($val);

+        // detect type and serialize

+        $xml = '';

+        switch(true) {

+            case (is_bool($val) || $type == 'boolean'):

+                   $this->debug("serialize_val: serialize boolean");

+                if ($type == 'boolean') {

+                    $val = $val ? 'true' : 'false';

+                } elseif (! $val) {

+                    $val = 0;

+                }

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

+                    $xml .= "<$name$xmlns$atts>$val</$name>";

+                } else {

+                    $xml .= "<$name$xmlns xsi:type=\"xsd:boolean\"$atts>$val</$name>";

+                }

+                break;

+            case (is_int($val) || is_long($val) || $type == 'int'):

+                   $this->debug("serialize_val: serialize int");

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

+                    $xml .= "<$name$xmlns$atts>$val</$name>";

+                } else {

+                    $xml .= "<$name$xmlns xsi:type=\"xsd:int\"$atts>$val</$name>";

+                }

+                break;

+            case (is_float($val)|| is_double($val) || $type == 'float'):

+                   $this->debug("serialize_val: serialize float");

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

+                    $xml .= "<$name$xmlns$atts>$val</$name>";

+                } else {

+                    $xml .= "<$name$xmlns xsi:type=\"xsd:float\"$atts>$val</$name>";

+                }

+                break;

+            case (is_string($val) || $type == 'string'):

+                   $this->debug("serialize_val: serialize string");

+                $val = $this->expandEntities($val);

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

+                    $xml .= "<$name$xmlns$atts>$val</$name>";

+                } else {

+                    $xml .= "<$name$xmlns xsi:type=\"xsd:string\"$atts>$val</$name>";

+                }

+                break;

+            case is_object($val):

+                   $this->debug("serialize_val: serialize object");

+                if (get_class($val) == 'soapval') {

+                    $this->debug("serialize_val: serialize soapval object");

+                    $pXml = $val->serialize($use);

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

+                    $val->clearDebug();

+                } else {

+                    if (! $name) {

+                        $name = get_class($val);

+                        $this->debug("In serialize_val, used class name $name as element name");

+                    } else {

+                        $this->debug("In serialize_val, do not override name $name for element name for class " . get_class($val));

+                    }

+                    foreach(get_object_vars($val) as $k => $v){

+                        $pXml = isset($pXml) ? $pXml.$this->serialize_val($v,$k,false,false,false,false,$use) : $this->serialize_val($v,$k,false,false,false,false,$use);

+                    }

+                }

+                if(isset($type) && isset($type_prefix)){

+                    $type_str = " xsi:type=\"$type_prefix:$type\"";

+                } else {

+                    $type_str = '';

+                }

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

+                    $xml .= "<$name$xmlns$atts>$pXml</$name>";

+                } else {

+                    $xml .= "<$name$xmlns$type_str$atts>$pXml</$name>";

+                }

+                break;

+            case (is_array($val) || $type):

+                // detect if struct or array

+                $valueType = $this->isArraySimpleOrStruct($val);

                 if($valueType=='arraySimple' || preg_match('/^ArrayOf/',$type)){

-			   		$this->debug("serialize_val: serialize array");

-					$i = 0;

-					if(is_array($val) && count($val)> 0){

-						foreach($val as $v){

-	                    	if(is_object($v) && get_class($v) ==  'soapval'){

-								$tt_ns = $v->type_ns;

-								$tt = $v->type;

-							} elseif (is_array($v)) {

-								$tt = $this->isArraySimpleOrStruct($v);

-							} else {

-								$tt = gettype($v);

-	                        }

-							$array_types[$tt] = 1;

-							// TODO: for literal, the name should be $name

-							$xml .= $this->serialize_val($v,'item',false,false,false,false,$use);

-							++$i;

-						}

-						if(count($array_types) > 1){

-							$array_typename = 'xsd:anyType';

-						} elseif(isset($tt) && isset($this->typemap[$this->XMLSchemaVersion][$tt])) {

-							if ($tt == 'integer') {

-								$tt = 'int';

-							}

-							$array_typename = 'xsd:'.$tt;

-						} elseif(isset($tt) && $tt == 'arraySimple'){

-							$array_typename = 'SOAP-ENC:Array';

-						} elseif(isset($tt) && $tt == 'arrayStruct'){

-							$array_typename = 'unnamed_struct_use_soapval';

-						} else {

-							// if type is prefixed, create type prefix

-							if ($tt_ns != '' && $tt_ns == $this->namespaces['xsd']){

-								 $array_typename = 'xsd:' . $tt;

-							} elseif ($tt_ns) {

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

-								$array_typename = "$tt_prefix:$tt";

-								$xmlns .= " xmlns:$tt_prefix=\"$tt_ns\"";

-							} else {

-								$array_typename = $tt;

-							}

-						}

-						$array_type = $i;

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

-							$type_str = '';

-						} else if (isset($type) && isset($type_prefix)) {

-							$type_str = " xsi:type=\"$type_prefix:$type\"";

-						} else {

-							$type_str = " xsi:type=\"SOAP-ENC:Array\" SOAP-ENC:arrayType=\"".$array_typename."[$array_type]\"";

-						}

-					// empty array

-					} else {

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

-							$type_str = '';

-						} else if (isset($type) && isset($type_prefix)) {

-							$type_str = " xsi:type=\"$type_prefix:$type\"";

-						} else {

-							$type_str = " xsi:type=\"SOAP-ENC:Array\" SOAP-ENC:arrayType=\"xsd:anyType[0]\"";

-						}

-					}

-					// TODO: for array in literal, there is no wrapper here

-					$xml = "<$name$xmlns$type_str$atts>".$xml."</$name>";

-				} else {

-					// got a struct

-			   		$this->debug("serialize_val: serialize struct");

-					if(isset($type) && isset($type_prefix)){

-						$type_str = " xsi:type=\"$type_prefix:$type\"";

-					} else {

-						$type_str = '';

-					}

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

-						$xml .= "<$name$xmlns$atts>";

-					} else {

-						$xml .= "<$name$xmlns$type_str$atts>";

-					}

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

-						// Apache Map

-						if ($type == 'Map' && $type_ns == 'http://xml.apache.org/xml-soap') {

-							$xml .= '<item>';

-							$xml .= $this->serialize_val($k,'key',false,false,false,false,$use);

-							$xml .= $this->serialize_val($v,'value',false,false,false,false,$use);

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

-						} else {

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

-						}

-					}

-					$xml .= "</$name>";

-				}

-				break;

-			default:

-		   		$this->debug("serialize_val: serialize unknown");

-				$xml .= 'not detected, got '.gettype($val).' for '.$val;

-				break;

-		}

-		$this->debug("serialize_val returning $xml");

-		return $xml;

-	}

-

-    /**

-    * serializes a message

-    *

-    * @param string $body the XML of the SOAP body

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

-    * @param array $namespaces optional the namespaces used in generating the body and headers

-    * @param string $style optional (rpc|document)

-    * @param string $use optional (encoded|literal)

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

-    * @return string the message

-    * @access public

-    */

+                        $this->debug("serialize_val: serialize array");

+                    $i = 0;

+                    if(is_array($val) && count($val)> 0){

+                        foreach($val as $v){

+                            if(is_object($v) && get_class($v) ==  'soapval'){

+                                $tt_ns = $v->type_ns;

+                                $tt = $v->type;

+                            } elseif (is_array($v)) {

+                                $tt = $this->isArraySimpleOrStruct($v);

+                            } else {

+                                $tt = gettype($v);

+                            }

+                            $array_types[$tt] = 1;

+                            // TODO: for literal, the name should be $name

+                            $xml .= $this->serialize_val($v,'item',false,false,false,false,$use);

+                            ++$i;

+                        }

+                        if(count($array_types) > 1){

+                            $array_typename = 'xsd:anyType';

+                        } elseif(isset($tt) && isset($this->typemap[$this->XMLSchemaVersion][$tt])) {

+                            if ($tt == 'integer') {

+                                $tt = 'int';

+                            }

+                            $array_typename = 'xsd:'.$tt;

+                        } elseif(isset($tt) && $tt == 'arraySimple'){

+                            $array_typename = 'SOAP-ENC:Array';

+                        } elseif(isset($tt) && $tt == 'arrayStruct'){

+                            $array_typename = 'unnamed_struct_use_soapval';

+                        } else {

+                            // if type is prefixed, create type prefix

+                            if ($tt_ns != '' && $tt_ns == $this->namespaces['xsd']){

+                                    $array_typename = 'xsd:' . $tt;

+                            } elseif ($tt_ns) {

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

+                                $array_typename = "$tt_prefix:$tt";

+                                $xmlns .= " xmlns:$tt_prefix=\"$tt_ns\"";

+                            } else {

+                                $array_typename = $tt;

+                            }

+                        }

+                        $array_type = $i;

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

+                            $type_str = '';

+                        } else if (isset($type) && isset($type_prefix)) {

+                            $type_str = " xsi:type=\"$type_prefix:$type\"";

+                        } else {

+                            $type_str = " xsi:type=\"SOAP-ENC:Array\" SOAP-ENC:arrayType=\"".$array_typename."[$array_type]\"";

+                        }

+                    // empty array

+                    } else {

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

+                            $type_str = '';

+                        } else if (isset($type) && isset($type_prefix)) {

+                            $type_str = " xsi:type=\"$type_prefix:$type\"";

+                        } else {

+                            $type_str = " xsi:type=\"SOAP-ENC:Array\" SOAP-ENC:arrayType=\"xsd:anyType[0]\"";

+                        }

+                    }

+                    // TODO: for array in literal, there is no wrapper here

+                    $xml = "<$name$xmlns$type_str$atts>".$xml."</$name>";

+                } else {

+                    // got a struct

+                        $this->debug("serialize_val: serialize struct");

+                    if(isset($type) && isset($type_prefix)){

+                        $type_str = " xsi:type=\"$type_prefix:$type\"";

+                    } else {

+                        $type_str = '';

+                    }

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

+                        $xml .= "<$name$xmlns$atts>";

+                    } else {

+                        $xml .= "<$name$xmlns$type_str$atts>";

+                    }

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

+                        // Apache Map

+                        if ($type == 'Map' && $type_ns == 'http://xml.apache.org/xml-soap') {

+                            $xml .= '<item>';

+                            $xml .= $this->serialize_val($k,'key',false,false,false,false,$use);

+                            $xml .= $this->serialize_val($v,'value',false,false,false,false,$use);

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

+                        } else {

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

+                        }

+                    }

+                    $xml .= "</$name>";

+                }

+                break;

+            default:

+                   $this->debug("serialize_val: serialize unknown");

+                $xml .= 'not detected, got '.gettype($val).' for '.$val;

+                break;

+        }

+        $this->debug("serialize_val returning $xml");

+        return $xml;

+    }

+

+    /**

+     * serializes a message

+     *

+     * @param string $body the XML of the SOAP body

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

+     * @param array $namespaces optional the namespaces used in generating the body and headers

+     * @param string $style optional (rpc|document)

+     * @param string $use optional (encoded|literal)

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

+     * @return string the message

+     * @access public

+     */

     function serializeEnvelope($body,$headers=false,$namespaces=array(),$style='rpc',$use='encoded',$encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'){

     // TODO: add an option to automatically run utf8_encode on $body and $headers

     // if $this->soap_defencoding is UTF-8.  Not doing this automatically allows

     // one to send arbitrary UTF-8 characters, not just characters that map to ISO-8859-1

 

-	$this->debug("In serializeEnvelope length=" . strlen($body) . " body (max 1000 characters)=" . substr($body, 0, 1000) . " style=$style use=$use encodingStyle=$encodingStyle");

-	$this->debug("headers:");

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

-	$this->debug("namespaces:");

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

+    $this->debug("In serializeEnvelope length=" . strlen($body) . " body (max 1000 characters)=" . substr($body, 0, 1000) . " style=$style use=$use encodingStyle=$encodingStyle");

+    $this->debug("headers:");

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

+    $this->debug("namespaces:");

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

 

-	// serialize namespaces

+    // serialize namespaces

     $ns_string = '';

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

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

-	}

-	if($encodingStyle) {

-		$ns_string = " SOAP-ENV:encodingStyle=\"$encodingStyle\"$ns_string";

-	}

-

-	// serialize headers

-	if($headers){

-		if (is_array($headers)) {

-			$xml = '';

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

-				if (is_object($v) && get_class($v) == 'soapval') {

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

-				} else {

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

-				}

-			}

-			$headers = $xml;

-			$this->debug("In serializeEnvelope, serialized array of headers to $headers");

-		}

-		$headers = "<SOAP-ENV:Header>".$headers."</SOAP-ENV:Header>";

-	}

-	// serialize envelope

-	return

-	'<?xml version="1.0" encoding="'.$this->soap_defencoding .'"?'.">".

-	'<SOAP-ENV:Envelope'.$ns_string.">".

-	$headers.

-	"<SOAP-ENV:Body>".

-		$body.

-	"</SOAP-ENV:Body>".

-	"</SOAP-ENV:Envelope>";

-    }

-

-	/**

-	 * formats a string to be inserted into an HTML stream

-	 *

-	 * @param string $str The string to format

-	 * @return string The formatted string

-	 * @access public

-	 * @deprecated

-	 */

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

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

+    }

+    if($encodingStyle) {

+        $ns_string = " SOAP-ENV:encodingStyle=\"$encodingStyle\"$ns_string";

+    }

+

+    // serialize headers

+    if($headers){

+        if (is_array($headers)) {

+            $xml = '';

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

+                if (is_object($v) && get_class($v) == 'soapval') {

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

+                } else {

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

+                }

+            }

+            $headers = $xml;

+            $this->debug("In serializeEnvelope, serialized array of headers to $headers");

+        }

+        $headers = "<SOAP-ENV:Header>".$headers."</SOAP-ENV:Header>";

+    }

+    // serialize envelope

+    return

+    '<?xml version="1.0" encoding="'.$this->soap_defencoding .'"?'.">".

+    '<SOAP-ENV:Envelope'.$ns_string.">".

+    $headers.

+    "<SOAP-ENV:Body>".

+        $body.

+    "</SOAP-ENV:Body>".

+    "</SOAP-ENV:Envelope>";

+    }

+

+    /**

+     * formats a string to be inserted into an HTML stream

+     *

+     * @param string $str The string to format

+     * @return string The formatted string

+     * @access public

+     * @deprecated

+     */

     function formatDump($str){

-		$str = htmlspecialchars($str);

-		return nl2br($str);

-    }

-

-	/**

-	* contracts (changes namespace to prefix) a qualified name

-	*

-	* @param    string $qname qname

-	* @return	string contracted qname

-	* @access   private

-	*/

-	function contractQname($qname){

-		// get element namespace

-		//$this->xdebug("Contract $qname");

-		if (strrpos($qname, ':')) {

-			// get unqualified name

-			$name = substr($qname, strrpos($qname, ':') + 1);

-			// get ns

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

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

-			if ($p) {

-				return $p . ':' . $name;

-			}

-			return $qname;

-		} else {

-			return $qname;

-		}

-	}

-

-	/**

-	* expands (changes prefix to namespace) a qualified name

-	*

-	* @param    string $qname qname

-	* @return	string expanded qname

-	* @access   private

-	*/

-	function expandQname($qname){

-		// get element prefix

-		if(strpos($qname,':') && !preg_match('/^http:\/\//',$qname)){

-			// get unqualified name

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

-			// get ns prefix

-			$prefix = substr($qname,0,strpos($qname,':'));

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

-				return $this->namespaces[$prefix].':'.$name;

-			} else {

-				return $qname;

-			}

-		} else {

-			return $qname;

-		}

-	}

-

-    /**

-    * returns the local part of a prefixed string

-    * returns the original string, if not prefixed

-    *

-    * @param string $str The prefixed string

-    * @return string The local part

-    * @access public

-    */

-	function getLocalPart($str){

-		if($sstr = strrchr($str,':')){

-			// get unqualified name

-			return substr( $sstr, 1 );

-		} else {

-			return $str;

-		}

-	}

-

-	/**

-    * returns the prefix part of a prefixed string

-    * returns false, if not prefixed

-    *

-    * @param string $str The prefixed string

-    * @return mixed The prefix or false if there is no prefix

-    * @access public

-    */

-	function getPrefix($str){

-		if($pos = strrpos($str,':')){

-			// get prefix

-			return substr($str,0,$pos);

-		}

-		return false;

-	}

-

-	/**

-    * pass it a prefix, it returns a namespace

-    *

-    * @param string $prefix The prefix

-    * @return mixed The namespace, false if no namespace has the specified prefix

-    * @access public

-    */

-	function getNamespaceFromPrefix($prefix){

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

-			return $this->namespaces[$prefix];

-		}

-		//$this->setError("No namespace registered for prefix '$prefix'");

-		return false;

-	}

-

-	/**

-    * returns the prefix for a given namespace (or prefix)

-    * or false if no prefixes registered for the given namespace

-    *

-    * @param string $ns The namespace

-    * @return mixed The prefix, false if the namespace has no prefixes

-    * @access public

-    */

-	function getPrefixFromNamespace($ns) {

-		foreach ($this->namespaces as $p => $n) {

-			if ($ns == $n || $ns == $p) {

-			    $this->usedNamespaces[$p] = $n;

-				return $p;

-			}

-		}

-		return false;

-	}

-

-	/**

-    * returns the time in ODBC canonical form with microseconds

-    *

-    * @return string The time in ODBC canonical form with microseconds

-    * @access public

-    */

-	function getmicrotime() {

-		if (function_exists('gettimeofday')) {

-			$tod = gettimeofday();

-			$sec = $tod['sec'];

-			$usec = $tod['usec'];

-		} else {

-			$sec = time();

-			$usec = 0;

-		}

-		return strftime('%Y-%m-%d %H:%M:%S', $sec) . '.' . sprintf('%06d', $usec);

-	}

-

-	/**

-	 * Returns a string with the output of var_dump

-	 *

-	 * @param mixed $data The variable to var_dump

-	 * @return string The output of var_dump

-	 * @access public

-	 */

+        $str = htmlspecialchars($str);

+        return nl2br($str);

+    }

+

+    /**

+     * contracts (changes namespace to prefix) a qualified name

+     *

+     * @param    string $qname qname

+     * @return	string contracted qname

+     * @access   private

+     */

+    function contractQname($qname){

+        // get element namespace

+        //$this->xdebug("Contract $qname");

+        if (strrpos($qname, ':')) {

+            // get unqualified name

+            $name = substr($qname, strrpos($qname, ':') + 1);

+            // get ns

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

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

+            if ($p) {

+                return $p . ':' . $name;

+            }

+            return $qname;

+        } else {

+            return $qname;

+        }

+    }

+

+    /**

+     * expands (changes prefix to namespace) a qualified name

+     *

+     * @param    string $qname qname

+     * @return	string expanded qname

+     * @access   private

+     */

+    function expandQname($qname){

+        // get element prefix

+        if(strpos($qname,':') && !preg_match('/^http:\/\//',$qname)){

+            // get unqualified name

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

+            // get ns prefix

+            $prefix = substr($qname,0,strpos($qname,':'));

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

+                return $this->namespaces[$prefix].':'.$name;

+            } else {

+                return $qname;

+            }

+        } else {

+            return $qname;

+        }

+    }

+

+    /**

+     * returns the local part of a prefixed string

+     * returns the original string, if not prefixed

+     *

+     * @param string $str The prefixed string

+     * @return string The local part

+     * @access public

+     */

+    function getLocalPart($str){

+        if($sstr = strrchr($str,':')){

+            // get unqualified name

+            return substr( $sstr, 1 );

+        } else {

+            return $str;

+        }

+    }

+

+    /**

+     * returns the prefix part of a prefixed string

+     * returns false, if not prefixed

+     *

+     * @param string $str The prefixed string

+     * @return mixed The prefix or false if there is no prefix

+     * @access public

+     */

+    function getPrefix($str){

+        if($pos = strrpos($str,':')){

+            // get prefix

+            return substr($str,0,$pos);

+        }

+        return false;

+    }

+

+    /**

+     * pass it a prefix, it returns a namespace

+     *

+     * @param string $prefix The prefix

+     * @return mixed The namespace, false if no namespace has the specified prefix

+     * @access public

+     */

+    function getNamespaceFromPrefix($prefix){

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

+            return $this->namespaces[$prefix];

+        }

+        //$this->setError("No namespace registered for prefix '$prefix'");

+        return false;

+    }

+

+    /**

+     * returns the prefix for a given namespace (or prefix)

+     * or false if no prefixes registered for the given namespace

+     *

+     * @param string $ns The namespace

+     * @return mixed The prefix, false if the namespace has no prefixes

+     * @access public

+     */

+    function getPrefixFromNamespace($ns) {

+        foreach ($this->namespaces as $p => $n) {

+            if ($ns == $n || $ns == $p) {

+                $this->usedNamespaces[$p] = $n;

+                return $p;

+            }

+        }

+        return false;

+    }

+

+    /**

+     * returns the time in ODBC canonical form with microseconds

+     *

+     * @return string The time in ODBC canonical form with microseconds

+     * @access public

+     */

+    function getmicrotime() {

+        if (function_exists('gettimeofday')) {

+            $tod = gettimeofday();

+            $sec = $tod['sec'];

+            $usec = $tod['usec'];

+        } else {

+            $sec = time();

+            $usec = 0;

+        }

+        return strftime('%Y-%m-%d %H:%M:%S', $sec) . '.' . sprintf('%06d', $usec);

+    }

+

+    /**

+     * Returns a string with the output of var_dump

+     *

+     * @param mixed $data The variable to var_dump

+     * @return string The output of var_dump

+     * @access public

+     */

     function varDump($data) {

-		ob_start();

-		var_dump($data);

-		$ret_val = ob_get_contents();

-		ob_end_clean();

-		return $ret_val;

-	}

-

-	/**

-	* represents the object as a string

-	*

-	* @return	string

-	* @access   public

-	*/

-	function __toString() {

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

-	}

+        ob_start();

+        var_dump($data);

+        $ret_val = ob_get_contents();

+        ob_end_clean();

+        return $ret_val;

+    }

+

+    /**

+     * represents the object as a string

+     *

+     * @return	string

+     * @access   public

+     */

+    function __toString() {

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

+    }

 }

 

 // XML Schema Datatype Helper Functions

@@ -901,35 +901,35 @@ 
 * @access   public

 */

 function timestamp_to_iso8601($timestamp,$utc=true){

-	$datestr = date('Y-m-d\TH:i:sO',$timestamp);

-	$pos = strrpos($datestr, "+");

-	if ($pos === FALSE) {

-		$pos = strrpos($datestr, "-");

-	}

-	if ($pos !== FALSE) {

-		if (strlen($datestr) == $pos + 5) {

-			$datestr = substr($datestr, 0, $pos + 3) . ':' . substr($datestr, -2);

-		}

-	}

-	if($utc){

-		$pattern = '/'.

-		'([0-9]{4})-'.	// centuries & years CCYY-

-		'([0-9]{2})-'.	// months MM-

-		'([0-9]{2})'.	// days DD

-		'T'.			// separator T

-		'([0-9]{2}):'.	// hours hh:

-		'([0-9]{2}):'.	// minutes mm:

-		'([0-9]{2})(\.[0-9]*)?'. // seconds ss.ss...

-		'(Z|[+\-][0-9]{2}:?[0-9]{2})?'. // Z to indicate UTC, -/+HH:MM:SS.SS... for local tz's

-		'/';

-

-		if(preg_match($pattern,$datestr,$regs)){

-			return sprintf('%04d-%02d-%02dT%02d:%02d:%02dZ',$regs[1],$regs[2],$regs[3],$regs[4],$regs[5],$regs[6]);

-		}

-		return false;

-	} else {

-		return $datestr;

-	}

+    $datestr = date('Y-m-d\TH:i:sO',$timestamp);

+    $pos = strrpos($datestr, "+");

+    if ($pos === FALSE) {

+        $pos = strrpos($datestr, "-");

+    }

+    if ($pos !== FALSE) {

+        if (strlen($datestr) == $pos + 5) {

+            $datestr = substr($datestr, 0, $pos + 3) . ':' . substr($datestr, -2);

+        }

+    }

+    if($utc){

+        $pattern = '/'.

+        '([0-9]{4})-'.	// centuries & years CCYY-

+        '([0-9]{2})-'.	// months MM-

+        '([0-9]{2})'.	// days DD

+        'T'.			// separator T

+        '([0-9]{2}):'.	// hours hh:

+        '([0-9]{2}):'.	// minutes mm:

+        '([0-9]{2})(\.[0-9]*)?'. // seconds ss.ss...

+        '(Z|[+\-][0-9]{2}:?[0-9]{2})?'. // Z to indicate UTC, -/+HH:MM:SS.SS... for local tz's

+        '/';

+

+        if(preg_match($pattern,$datestr,$regs)){

+            return sprintf('%04d-%02d-%02dT%02d:%02d:%02dZ',$regs[1],$regs[2],$regs[3],$regs[4],$regs[5],$regs[6]);

+        }

+        return false;

+    } else {

+        return $datestr;

+    }

 }

 

 /**

@@ -940,35 +940,35 @@ 
 * @access   public

 */

 function iso8601_to_timestamp($datestr){

-	$pattern = '/'.

-	'([0-9]{4})-'.	// centuries & years CCYY-

-	'([0-9]{2})-'.	// months MM-

-	'([0-9]{2})'.	// days DD

-	'T'.			// separator T

-	'([0-9]{2}):'.	// hours hh:

-	'([0-9]{2}):'.	// minutes mm:

-	'([0-9]{2})(\.[0-9]+)?'. // seconds ss.ss...

-	'(Z|[+\-][0-9]{2}:?[0-9]{2})?'. // Z to indicate UTC, -/+HH:MM:SS.SS... for local tz's

-	'/';

-	if(preg_match($pattern,$datestr,$regs)){

-		// not utc

-		if($regs[8] != 'Z'){

-			$op = substr($regs[8],0,1);

-			$h = substr($regs[8],1,2);

-			$m = substr($regs[8],strlen($regs[8])-2,2);

-			if($op == '-'){

-				$regs[4] = $regs[4] + $h;

-				$regs[5] = $regs[5] + $m;

-			} elseif($op == '+'){

-				$regs[4] = $regs[4] - $h;

-				$regs[5] = $regs[5] - $m;

-			}

-		}

-		return gmmktime($regs[4], $regs[5], $regs[6], $regs[2], $regs[3], $regs[1]);

+    $pattern = '/'.

+    '([0-9]{4})-'.	// centuries & years CCYY-

+    '([0-9]{2})-'.	// months MM-

+    '([0-9]{2})'.	// days DD

+    'T'.			// separator T

+    '([0-9]{2}):'.	// hours hh:

+    '([0-9]{2}):'.	// minutes mm:

+    '([0-9]{2})(\.[0-9]+)?'. // seconds ss.ss...

+    '(Z|[+\-][0-9]{2}:?[0-9]{2})?'. // Z to indicate UTC, -/+HH:MM:SS.SS... for local tz's

+    '/';

+    if(preg_match($pattern,$datestr,$regs)){

+        // not utc

+        if($regs[8] != 'Z'){

+            $op = substr($regs[8],0,1);

+            $h = substr($regs[8],1,2);

+            $m = substr($regs[8],strlen($regs[8])-2,2);

+            if($op == '-'){

+                $regs[4] = $regs[4] + $h;

+                $regs[5] = $regs[5] + $m;

+            } elseif($op == '+'){

+                $regs[4] = $regs[4] - $h;

+                $regs[5] = $regs[5] - $m;

+            }

+        }

+        return gmmktime($regs[4], $regs[5], $regs[6], $regs[2], $regs[3], $regs[1]);

 //		return strtotime("$regs[1]-$regs[2]-$regs[3] $regs[4]:$regs[5]:$regs[6]Z");

-	} else {

-		return false;

-	}

+    } else {

+        return false;

+    }

 }

 

 /**

@@ -980,13 +980,13 @@ 
 */

 function usleepWindows($usec)

 {

-	$start = gettimeofday();

-

-	do

-	{

-		$stop = gettimeofday();

-		$timePassed = 1000000 * ($stop['sec'] - $start['sec'])

-		+ $stop['usec'] - $start['usec'];

-	}

-	while ($timePassed < $usec);

+    $start = gettimeofday();

+

+    do

+    {

+        $stop = gettimeofday();

+        $timePassed = 1000000 * ($stop['sec'] - $start['sec'])

+        + $stop['usec'] - $start['usec'];

+    }

+    while ($timePassed < $usec);

 }

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

Doc Comments +8 added lines, -7 removed lines

@@ -843,7 +843,7 @@ 
 	*

 	* @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

+	* @return	false|null	value of the message, decoded into a PHP type

 	* @access   private

 	*/

     function parseRequest($headers, $data) {

@@ -951,10 +951,10 @@ 
 	* @param    string $name the name of the PHP function, class.method or class..method

 	* @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	mixed $namespace the element namespace for the method or false

-	* @param	mixed $soapaction the soapaction for the method or false

-	* @param	mixed $style optional (rpc|document) or false Note: when 'document' is specified, parameter and return wrappers are created for you automatically

-	* @param	mixed $use optional (encoded|literal) or false

+	* @param	string $namespace the element namespace for the method or false

+	* @param	string $soapaction the soapaction for the method or false

+	* @param	string $style optional (rpc|document) or false Note: when 'document' is specified, parameter and return wrappers are created for you automatically

+	* @param	string $use optional (encoded|literal) or false

 	* @param	string $documentation optional Description to include in WSDL

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

 	* @access   public

@@ -1041,11 +1041,12 @@ 
     * Acts as a flag to enable internal WSDL generation

     *

     * @param string $serviceName, name of the service

-    * @param mixed $namespace optional 'tns' service namespace or false

+    * @param string $namespace optional 'tns' service namespace or false

     * @param mixed $endpoint optional URL of service endpoint or false

     * @param string $style optional (rpc|document) WSDL style (also specified by operation)

     * @param string $transport optional SOAP transport

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

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

     */

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

     {

Indentation +1023 added lines, -1023 removed lines

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

 */

 class nusoap_server extends nusoap_base {

-	/**

-	 * HTTP headers of request

-	 * @var array

-	 * @access private

-	 */

-	var $headers = array();

-	/**

-	 * HTTP request

-	 * @var string

-	 * @access private

-	 */

-	var $request = '';

-	/**

-	 * SOAP headers from request (incomplete namespace resolution; special characters not escaped) (text)

-	 * @var string

-	 * @access public

-	 */

-	var $requestHeaders = '';

-	/**

-	 * SOAP Headers from request (parsed)

-	 * @var mixed

-	 * @access public

-	 */

-	var $requestHeader = NULL;

-	/**

-	 * SOAP body request portion (incomplete namespace resolution; special characters not escaped) (text)

-	 * @var string

-	 * @access public

-	 */

-	var $document = '';

-	/**

-	 * SOAP payload for request (text)

-	 * @var string

-	 * @access public

-	 */

-	var $requestSOAP = '';

-	/**

-	 * requested method namespace URI

-	 * @var string

-	 * @access private

-	 */

-	var $methodURI = '';

-	/**

-	 * name of method requested

-	 * @var string

-	 * @access private

-	 */

-	var $methodname = '';

-	/**

-	 * method parameters from request

-	 * @var array

-	 * @access private

-	 */

-	var $methodparams = array();

-	/**

-	 * SOAP Action from request

-	 * @var string

-	 * @access private

-	 */

-	var $SOAPAction = '';

-	/**

-	 * character set encoding of incoming (request) messages

-	 * @var string

-	 * @access public

-	 */

-	var $xml_encoding = '';

-	/**

-	 * toggles whether the parser decodes element content w/ utf8_decode()

-	 * @var boolean

-	 * @access public

-	 */

+    /**

+     * HTTP headers of request

+     * @var array

+     * @access private

+     */

+    var $headers = array();

+    /**

+     * HTTP request

+     * @var string

+     * @access private

+     */

+    var $request = '';

+    /**

+     * SOAP headers from request (incomplete namespace resolution; special characters not escaped) (text)

+     * @var string

+     * @access public

+     */

+    var $requestHeaders = '';

+    /**

+     * SOAP Headers from request (parsed)

+     * @var mixed

+     * @access public

+     */

+    var $requestHeader = NULL;

+    /**

+     * SOAP body request portion (incomplete namespace resolution; special characters not escaped) (text)

+     * @var string

+     * @access public

+     */

+    var $document = '';

+    /**

+     * SOAP payload for request (text)

+     * @var string

+     * @access public

+     */

+    var $requestSOAP = '';

+    /**

+     * requested method namespace URI

+     * @var string

+     * @access private

+     */

+    var $methodURI = '';

+    /**

+     * name of method requested

+     * @var string

+     * @access private

+     */

+    var $methodname = '';

+    /**

+     * method parameters from request

+     * @var array

+     * @access private

+     */

+    var $methodparams = array();

+    /**

+     * SOAP Action from request

+     * @var string

+     * @access private

+     */

+    var $SOAPAction = '';

+    /**

+     * character set encoding of incoming (request) messages

+     * @var string

+     * @access public

+     */

+    var $xml_encoding = '';

+    /**

+     * toggles whether the parser decodes element content w/ utf8_decode()

+     * @var boolean

+     * @access public

+     */

     var $decode_utf8 = true;

 

-	/**

-	 * HTTP headers of response

-	 * @var array

-	 * @access public

-	 */

-	var $outgoing_headers = array();

-	/**

-	 * HTTP response

-	 * @var string

-	 * @access private

-	 */

-	var $response = '';

-	/**

-	 * SOAP headers for response (text or array of soapval or associative array)

-	 * @var mixed

-	 * @access public

-	 */

-	var $responseHeaders = '';

-	/**

-	 * SOAP payload for response (text)

-	 * @var string

-	 * @access private

-	 */

-	var $responseSOAP = '';

-	/**

-	 * method return value to place in response

-	 * @var mixed

-	 * @access private

-	 */

-	var $methodreturn = false;

-	/**

-	 * whether $methodreturn is a string of literal XML

-	 * @var boolean

-	 * @access public

-	 */

-	var $methodreturnisliteralxml = false;

-	/**

-	 * SOAP fault for response (or false)

-	 * @var mixed

-	 * @access private

-	 */

-	var $fault = false;

-	/**

-	 * text indication of result (for debugging)

-	 * @var string

-	 * @access private

-	 */

-	var $result = 'successful';

+    /**

+     * HTTP headers of response

+     * @var array

+     * @access public

+     */

+    var $outgoing_headers = array();

+    /**

+     * HTTP response

+     * @var string

+     * @access private

+     */

+    var $response = '';

+    /**

+     * SOAP headers for response (text or array of soapval or associative array)

+     * @var mixed

+     * @access public

+     */

+    var $responseHeaders = '';

+    /**

+     * SOAP payload for response (text)

+     * @var string

+     * @access private

+     */

+    var $responseSOAP = '';

+    /**

+     * method return value to place in response

+     * @var mixed

+     * @access private

+     */

+    var $methodreturn = false;

+    /**

+     * whether $methodreturn is a string of literal XML

+     * @var boolean

+     * @access public

+     */

+    var $methodreturnisliteralxml = false;

+    /**

+     * SOAP fault for response (or false)

+     * @var mixed

+     * @access private

+     */

+    var $fault = false;

+    /**

+     * text indication of result (for debugging)

+     * @var string

+     * @access private

+     */

+    var $result = 'successful';

 

-	/**

-	 * assoc array of operations => opData; operations are added by the register()

-	 * method or by parsing an external WSDL definition

-	 * @var array

-	 * @access private

-	 */

-	var $operations = array();

-	/**

-	 * wsdl instance (if one)

-	 * @var mixed

-	 * @access private

-	 */

-	var $wsdl = false;

-	/**

-	 * URL for WSDL (if one)

-	 * @var mixed

-	 * @access private

-	 */

-	var $externalWSDLURL = false;

-	/**

-	 * whether to append debug to response as XML comment

-	 * @var boolean

-	 * @access public

-	 */

-	var $debug_flag = false;

+    /**

+     * assoc array of operations => opData; operations are added by the register()

+     * method or by parsing an external WSDL definition

+     * @var array

+     * @access private

+     */

+    var $operations = array();

+    /**

+     * wsdl instance (if one)

+     * @var mixed

+     * @access private

+     */

+    var $wsdl = false;

+    /**

+     * URL for WSDL (if one)

+     * @var mixed

+     * @access private

+     */

+    var $externalWSDLURL = false;

+    /**

+     * whether to append debug to response as XML comment

+     * @var boolean

+     * @access public

+     */

+    var $debug_flag = false;

 

 

-	/**

-	* constructor

-    * the optional parameter is a path to a WSDL file that you'd like to bind the server instance to.

-	*

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

-	* @access   public

-	*/

-	function nusoap_server($wsdl=false){

-		parent::nusoap_base();

-		// turn on debugging?

-		global $debug;

-		global $HTTP_SERVER_VARS;

+    /**

+     * constructor

+     * the optional parameter is a path to a WSDL file that you'd like to bind the server instance to.

+     *

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

+     * @access   public

+     */

+    function nusoap_server($wsdl=false){

+        parent::nusoap_base();

+        // turn on debugging?

+        global $debug;

+        global $HTTP_SERVER_VARS;

 

-		if (isset($_SERVER)) {

-			$this->debug("_SERVER is defined:");

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

-		} elseif (isset($HTTP_SERVER_VARS)) {

-			$this->debug("HTTP_SERVER_VARS is defined:");

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

-		} else {

-			$this->debug("Neither _SERVER nor HTTP_SERVER_VARS is defined.");

-		}

+        if (isset($_SERVER)) {

+            $this->debug("_SERVER is defined:");

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

+        } elseif (isset($HTTP_SERVER_VARS)) {

+            $this->debug("HTTP_SERVER_VARS is defined:");

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

+        } else {

+            $this->debug("Neither _SERVER nor HTTP_SERVER_VARS is defined.");

+        }

 

-		if (isset($debug)) {

-			$this->debug("In nusoap_server, set debug_flag=$debug based on global flag");

-			$this->debug_flag = $debug;

-		} elseif (isset($_SERVER['QUERY_STRING'])) {

-			$qs = explode('&', $_SERVER['QUERY_STRING']);

-			foreach ($qs as $v) {

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

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

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

-				}

-			}

-		} elseif (isset($HTTP_SERVER_VARS['QUERY_STRING'])) {

-			$qs = explode('&', $HTTP_SERVER_VARS['QUERY_STRING']);

-			foreach ($qs as $v) {

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

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

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

-				}

-			}

-		}

+        if (isset($debug)) {

+            $this->debug("In nusoap_server, set debug_flag=$debug based on global flag");

+            $this->debug_flag = $debug;

+        } elseif (isset($_SERVER['QUERY_STRING'])) {

+            $qs = explode('&', $_SERVER['QUERY_STRING']);

+            foreach ($qs as $v) {

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

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

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

+                }

+            }

+        } elseif (isset($HTTP_SERVER_VARS['QUERY_STRING'])) {

+            $qs = explode('&', $HTTP_SERVER_VARS['QUERY_STRING']);

+            foreach ($qs as $v) {

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

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

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

+                }

+            }

+        }

 

-		// wsdl

-		if($wsdl){

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

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

-				$this->wsdl = $wsdl;

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

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

-			} else {

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

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

-				$this->externalWSDLURL = $wsdl;

-			}

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

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

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

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

-			}

-		}

-	}

+        // wsdl

+        if($wsdl){

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

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

+                $this->wsdl = $wsdl;

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

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

+            } else {

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

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

+                $this->externalWSDLURL = $wsdl;

+            }

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

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

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

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

+            }

+        }

+    }

 

-	/**

-	* processes request and returns response

-	*

-	* @param    string $data usually is the value of $HTTP_RAW_POST_DATA

-	* @access   public

-	*/

-	function service($data){

-		global $HTTP_SERVER_VARS;

+    /**

+     * processes request and returns response

+     *

+     * @param    string $data usually is the value of $HTTP_RAW_POST_DATA

+     * @access   public

+     */

+    function service($data){

+        global $HTTP_SERVER_VARS;

 

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

-			$rm = $_SERVER['REQUEST_METHOD'];

-		} elseif (isset($HTTP_SERVER_VARS['REQUEST_METHOD'])) {

-			$rm = $HTTP_SERVER_VARS['REQUEST_METHOD'];

-		} else {

-			$rm = '';

-		}

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

+            $rm = $_SERVER['REQUEST_METHOD'];

+        } elseif (isset($HTTP_SERVER_VARS['REQUEST_METHOD'])) {

+            $rm = $HTTP_SERVER_VARS['REQUEST_METHOD'];

+        } else {

+            $rm = '';

+        }

 

-		if (isset($_SERVER['QUERY_STRING'])) {

-			$qs = $_SERVER['QUERY_STRING'];

-		} elseif (isset($HTTP_SERVER_VARS['QUERY_STRING'])) {

-			$qs = $HTTP_SERVER_VARS['QUERY_STRING'];

-		} else {

-			$qs = '';

-		}

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

+        if (isset($_SERVER['QUERY_STRING'])) {

+            $qs = $_SERVER['QUERY_STRING'];

+        } elseif (isset($HTTP_SERVER_VARS['QUERY_STRING'])) {

+            $qs = $HTTP_SERVER_VARS['QUERY_STRING'];

+        } else {

+            $qs = '';

+        }

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

 

-		if ($rm == 'POST') {

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

-			$this->parse_request($data);

-			if (! $this->fault) {

-				$this->invoke_method();

-			}

-			if (! $this->fault) {

-				$this->serialize_return();

-			}

-			$this->send_response();

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

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

-			if ($this->externalWSDLURL){

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

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

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

-              } else { // assume file

-				$this->debug("In service, use file passthru for WSDL");

+        if ($rm == 'POST') {

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

+            $this->parse_request($data);

+            if (! $this->fault) {

+                $this->invoke_method();

+            }

+            if (! $this->fault) {

+                $this->serialize_return();

+            }

+            $this->send_response();

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

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

+            if ($this->externalWSDLURL){

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

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

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

+                } else { // assume file

+                $this->debug("In service, use file passthru for WSDL");

                 header("Content-Type: text/xml\r\n");

-				$pos = strpos($this->externalWSDLURL, "file://");

-				if ($pos === false) {

-					$filename = $this->externalWSDLURL;

-				} else {

-					$filename = substr($this->externalWSDLURL, $pos + 7);

-				}

+                $pos = strpos($this->externalWSDLURL, "file://");

+                if ($pos === false) {

+                    $filename = $this->externalWSDLURL;

+                } else {

+                    $filename = substr($this->externalWSDLURL, $pos + 7);

+                }

                 $fp = fopen($this->externalWSDLURL, 'r');

                 fpassthru($fp);

-              }

-			} elseif ($this->wsdl) {

-				$this->debug("In service, serialize WSDL");

-				header("Content-Type: text/xml; charset=ISO-8859-1\r\n");

-				print $this->wsdl->serialize($this->debug_flag);

-				if ($this->debug_flag) {

-					$this->debug('wsdl:');

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

-					print $this->getDebugAsXMLComment();

-				}

-			} else {

-				$this->debug("In service, there is no WSDL");

-				header("Content-Type: text/html; charset=ISO-8859-1\r\n");

-				print "This service does not provide WSDL";

-			}

-		} elseif ($this->wsdl) {

-			$this->debug("In service, return Web description");

-			print $this->wsdl->webDescription();

-		} else {

-			$this->debug("In service, no Web description");

-			header("Content-Type: text/html; charset=ISO-8859-1\r\n");

-			print "This service does not provide a Web description";

-		}

-	}

+                }

+            } elseif ($this->wsdl) {

+                $this->debug("In service, serialize WSDL");

+                header("Content-Type: text/xml; charset=ISO-8859-1\r\n");

+                print $this->wsdl->serialize($this->debug_flag);

+                if ($this->debug_flag) {

+                    $this->debug('wsdl:');

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

+                    print $this->getDebugAsXMLComment();

+                }

+            } else {

+                $this->debug("In service, there is no WSDL");

+                header("Content-Type: text/html; charset=ISO-8859-1\r\n");

+                print "This service does not provide WSDL";

+            }

+        } elseif ($this->wsdl) {

+            $this->debug("In service, return Web description");

+            print $this->wsdl->webDescription();

+        } else {

+            $this->debug("In service, no Web description");

+            header("Content-Type: text/html; charset=ISO-8859-1\r\n");

+            print "This service does not provide a Web description";

+        }

+    }

 

-	/**

-	* parses HTTP request headers.

-	*

-	* The following fields are set by this function (when successful)

-	*

-	* headers

-	* request

-	* xml_encoding

-	* SOAPAction

-	*

-	* @access   private

-	*/

-	function parse_http_headers() {

-		global $HTTP_SERVER_VARS;

+    /**

+     * parses HTTP request headers.

+     *

+     * The following fields are set by this function (when successful)

+     *

+     * headers

+     * request

+     * xml_encoding

+     * SOAPAction

+     *

+     * @access   private

+     */

+    function parse_http_headers() {

+        global $HTTP_SERVER_VARS;

 

-		$this->request = '';

-		$this->SOAPAction = '';

-		if(function_exists('getallheaders')){

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

-			$headers = getallheaders();

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

-				$k = strtolower($k);

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

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

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

-			}

-			// get SOAPAction header

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

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

-			}

-			// get the character encoding of the incoming request

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

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

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

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

-			}

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

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

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

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

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

-				} else {

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

-				}

-				if ($k == 'soapaction') {

-					// get SOAPAction header

-					$k = 'SOAPAction';

-					$v = str_replace('"', '', $v);

-					$v = str_replace('\\', '', $v);

-					$this->SOAPAction = $v;

-				} else if ($k == 'content-type') {

-					// get the character encoding of the incoming request

-					if (strpos($v, '=')) {

-						$enc = substr(strstr($v, '='), 1);

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

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

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

-							$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->headers[$k] = $v;

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

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

-			}

-		} elseif (is_array($HTTP_SERVER_VARS)) {

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

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

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

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

-				} else {

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

-				}

-				if ($k == 'soapaction') {

-					// get SOAPAction header

-					$k = 'SOAPAction';

-					$v = str_replace('"', '', $v);

-					$v = str_replace('\\', '', $v);

-					$this->SOAPAction = $v;

-				} else if ($k == 'content-type') {

-					// get the character encoding of the incoming request

-					if (strpos($v, '=')) {

-						$enc = substr(strstr($v, '='), 1);

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

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

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

-							$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->headers[$k] = $v;

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

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

-			}

-		} else {

-			$this->debug("In parse_http_headers, HTTP headers not accessible");

-			$this->setError("HTTP headers not accessible");

-		}

-	}

+        $this->request = '';

+        $this->SOAPAction = '';

+        if(function_exists('getallheaders')){

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

+            $headers = getallheaders();

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

+                $k = strtolower($k);

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

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

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

+            }

+            // get SOAPAction header

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

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

+            }

+            // get the character encoding of the incoming request

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

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

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

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

+            }

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

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

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

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

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

+                } else {

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

+                }

+                if ($k == 'soapaction') {

+                    // get SOAPAction header

+                    $k = 'SOAPAction';

+                    $v = str_replace('"', '', $v);

+                    $v = str_replace('\\', '', $v);

+                    $this->SOAPAction = $v;

+                } else if ($k == 'content-type') {

+                    // get the character encoding of the incoming request

+                    if (strpos($v, '=')) {

+                        $enc = substr(strstr($v, '='), 1);

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

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

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

+                            $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->headers[$k] = $v;

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

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

+            }

+        } elseif (is_array($HTTP_SERVER_VARS)) {

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

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

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

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

+                } else {

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

+                }

+                if ($k == 'soapaction') {

+                    // get SOAPAction header

+                    $k = 'SOAPAction';

+                    $v = str_replace('"', '', $v);

+                    $v = str_replace('\\', '', $v);

+                    $this->SOAPAction = $v;

+                } else if ($k == 'content-type') {

+                    // get the character encoding of the incoming request

+                    if (strpos($v, '=')) {

+                        $enc = substr(strstr($v, '='), 1);

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

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

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

+                            $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->headers[$k] = $v;

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

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

+            }

+        } else {

+            $this->debug("In parse_http_headers, HTTP headers not accessible");

+            $this->setError("HTTP headers not accessible");

+        }

+    }

 

-	/**

-	* parses a request

-	*

-	* The following fields are set by this function (when successful)

-	*

-	* headers

-	* request

-	* xml_encoding

-	* SOAPAction

-	* request

-	* requestSOAP

-	* methodURI

-	* methodname

-	* methodparams

-	* requestHeaders

-	* document

-	*

-	* This sets the fault field on error

-	*

-	* @param    string $data XML string

-	* @access   private

-	*/

-	function parse_request($data='') {

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

-		$this->parse_http_headers();

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

-		// uncompress if necessary

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

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

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

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

-				if (function_exists('gzuncompress')) {

-					if ($this->headers['content-encoding'] == 'deflate' && $degzdata = @gzuncompress($data)) {

-						$data = $degzdata;

-					} elseif ($this->headers['content-encoding'] == 'gzip' && $degzdata = gzinflate(substr($data, 10))) {

-						$data = $degzdata;

-					} else {

-						$this->fault('SOAP-ENV:Client', 'Errors occurred when trying to decode the data');

-						return;

-					}

-				} else {

-					$this->fault('SOAP-ENV:Client', 'This Server does not support compressed data');

-					return;

-				}

-			}

-		}

-		$this->request .= "\r\n".$data;

-		$data = $this->parseRequest($this->headers, $data);

-		$this->requestSOAP = $data;

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

-	}

+    /**

+     * parses a request

+     *

+     * The following fields are set by this function (when successful)

+     *

+     * headers

+     * request

+     * xml_encoding

+     * SOAPAction

+     * request

+     * requestSOAP

+     * methodURI

+     * methodname

+     * methodparams

+     * requestHeaders

+     * document

+     *

+     * This sets the fault field on error

+     *

+     * @param    string $data XML string

+     * @access   private

+     */

+    function parse_request($data='') {

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

+        $this->parse_http_headers();

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

+        // uncompress if necessary

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

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

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

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

+                if (function_exists('gzuncompress')) {

+                    if ($this->headers['content-encoding'] == 'deflate' && $degzdata = @gzuncompress($data)) {

+                        $data = $degzdata;

+                    } elseif ($this->headers['content-encoding'] == 'gzip' && $degzdata = gzinflate(substr($data, 10))) {

+                        $data = $degzdata;

+                    } else {

+                        $this->fault('SOAP-ENV:Client', 'Errors occurred when trying to decode the data');

+                        return;

+                    }

+                } else {

+                    $this->fault('SOAP-ENV:Client', 'This Server does not support compressed data');

+                    return;

+                }

+            }

+        }

+        $this->request .= "\r\n".$data;

+        $data = $this->parseRequest($this->headers, $data);

+        $this->requestSOAP = $data;

+        $this->debug('leaving parse_request');

+    }

 

-	/**

-	* invokes a PHP function for the requested SOAP method

-	*

-	* The following fields are set by this function (when successful)

-	*

-	* methodreturn

-	*

-	* Note that the PHP function that is called may also set the following

-	* fields to affect the response sent to the client

-	*

-	* responseHeaders

-	* outgoing_headers

-	*

-	* This sets the fault field on error

-	*

-	* @access   private

-	*/

-	function invoke_method() {

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

+    /**

+     * invokes a PHP function for the requested SOAP method

+     *

+     * The following fields are set by this function (when successful)

+     *

+     * methodreturn

+     *

+     * Note that the PHP function that is called may also set the following

+     * fields to affect the response sent to the client

+     *

+     * responseHeaders

+     * outgoing_headers

+     *

+     * This sets the fault field on error

+     *

+     * @access   private

+     */

+    function invoke_method() {

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

 

-		//

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

-		// you use SOAP RPC, and the client is .NET, please be aware of the following...

-		// when the .NET wsdl.exe utility generates a proxy, it will remove the '.' or '..' from the

-		// method name.  that is fine for naming the .NET methods.  it is not fine for properly constructing

-		// the XML request and reading the XML response.  you need to add the RequestElementName and

-		// ResponseElementName to the System.Web.Services.Protocols.SoapRpcMethodAttribute that wsdl.exe

-		// generates for the method.  these parameters are used to specify the correct XML element names

-		// for .NET to use, i.e. the names with the '.' in them.

-		//

-		$orig_methodname = $this->methodname;

-		if ($this->wsdl) {

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

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

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

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

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

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

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

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

-			} else {

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

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

-				return;

-			}

-		} else {

-			$this->debug('in invoke_method, no WSDL to validate method');

-		}

+        //

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

+        // you use SOAP RPC, and the client is .NET, please be aware of the following...

+        // when the .NET wsdl.exe utility generates a proxy, it will remove the '.' or '..' from the

+        // method name.  that is fine for naming the .NET methods.  it is not fine for properly constructing

+        // the XML request and reading the XML response.  you need to add the RequestElementName and

+        // ResponseElementName to the System.Web.Services.Protocols.SoapRpcMethodAttribute that wsdl.exe

+        // generates for the method.  these parameters are used to specify the correct XML element names

+        // for .NET to use, i.e. the names with the '.' in them.

+        //

+        $orig_methodname = $this->methodname;

+        if ($this->wsdl) {

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

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

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

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

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

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

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

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

+            } else {

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

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

+                return;

+            }

+        } else {

+            $this->debug('in invoke_method, no WSDL to validate method');

+        }

 

-		// if a . is present in $this->methodname, we see if there is a class in scope,

-		// which could be referred to. We will also distinguish between two deliminators,

-		// to allow methods to be called a the class or an instance

-		if (strpos($this->methodname, '..') > 0) {

-			$delim = '..';

-		} else if (strpos($this->methodname, '.') > 0) {

-			$delim = '.';

-		} else {

-			$delim = '';

-		}

-		$this->debug("in invoke_method, delim=$delim");

+        // if a . is present in $this->methodname, we see if there is a class in scope,

+        // which could be referred to. We will also distinguish between two deliminators,

+        // to allow methods to be called a the class or an instance

+        if (strpos($this->methodname, '..') > 0) {

+            $delim = '..';

+        } else if (strpos($this->methodname, '.') > 0) {

+            $delim = '.';

+        } else {

+            $delim = '';

+        }

+        $this->debug("in invoke_method, delim=$delim");

 

-		$class = '';

-		$method = '';

-		if (strlen($delim) > 0 && substr_count($this->methodname, $delim) == 1) {

-			$try_class = substr($this->methodname, 0, strpos($this->methodname, $delim));

-			if (class_exists($try_class)) {

-				// get the class and method name

-				$class = $try_class;

-				$method = substr($this->methodname, strpos($this->methodname, $delim) + strlen($delim));

-				$this->debug("in invoke_method, class=$class method=$method delim=$delim");

-			} else {

-				$this->debug("in invoke_method, class=$try_class not found");

-			}

-		} else {

-			$try_class = '';

-			$this->debug("in invoke_method, no class to try");

-		}

+        $class = '';

+        $method = '';

+        if (strlen($delim) > 0 && substr_count($this->methodname, $delim) == 1) {

+            $try_class = substr($this->methodname, 0, strpos($this->methodname, $delim));

+            if (class_exists($try_class)) {

+                // get the class and method name

+                $class = $try_class;

+                $method = substr($this->methodname, strpos($this->methodname, $delim) + strlen($delim));

+                $this->debug("in invoke_method, class=$class method=$method delim=$delim");

+            } else {

+                $this->debug("in invoke_method, class=$try_class not found");

+            }

+        } else {

+            $try_class = '';

+            $this->debug("in invoke_method, no class to try");

+        }

 

-		// does method exist?

-		if ($class == '') {

-			if (!function_exists($this->methodname)) {

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

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

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

-				return;

-			}

-		} else {

-			$method_to_compare = (substr(phpversion(), 0, 2) == '4.') ? strtolower($method) : $method;

-			if (!in_array($method_to_compare, get_class_methods($class))) {

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

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

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

-				return;

-			}

-		}

+        // does method exist?

+        if ($class == '') {

+            if (!function_exists($this->methodname)) {

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

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

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

+                return;

+            }

+        } else {

+            $method_to_compare = (substr(phpversion(), 0, 2) == '4.') ? strtolower($method) : $method;

+            if (!in_array($method_to_compare, get_class_methods($class))) {

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

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

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

+                return;

+            }

+        }

 

-		// evaluate message, getting back parameters

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

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

-			// debug

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

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

-			// return fault

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

-			return;

-		}

+        // evaluate message, getting back parameters

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

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

+            // debug

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

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

+            // return fault

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

+            return;

+        }

 

-		// if there are parameters to pass

-		$this->debug('in invoke_method, params:');

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

-		$this->debug("in invoke_method, calling '$this->methodname'");

-		if (!function_exists('call_user_func_array')) {

-			if ($class == '') {

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

-				$funcCall = "\$this->methodreturn = $this->methodname(";

-			} else {

-				if ($delim == '..') {

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

-					$funcCall = "\$this->methodreturn = ".$class."::".$method."(";

-				} else {

-					$this->debug('in invoke_method, calling instance method using eval()');

-					// generate unique instance name

-					$instname = "\$inst_".time();

-					$funcCall = $instname." = new ".$class."(); ";

-					$funcCall .= "\$this->methodreturn = ".$instname."->".$method."(";

-				}

-			}

-			if ($this->methodparams) {

-				foreach ($this->methodparams as $param) {

-					if (is_array($param) || is_object($param)) {

-						$this->fault('SOAP-ENV:Client', 'NuSOAP does not handle complexType parameters correctly when using eval; call_user_func_array must be available');

-						return;

-					}

-					$funcCall .= "\"$param\",";

-				}

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

-			}

-			$funcCall .= ');';

-			$this->debug('in invoke_method, function call: '.$funcCall);

-			@eval($funcCall);

-		} else {

-			if ($class == '') {

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

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

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

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

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

-			} else {

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

-				$instance = new $class ();

-				$call_arg = array(&$instance, $method);

-			}

-			if (is_array($this->methodparams)) {

-				$this->methodreturn = call_user_func_array($call_arg, array_values($this->methodparams));

-			} else {

-				$this->methodreturn = call_user_func_array($call_arg, array());

-			}

-		}

+        // if there are parameters to pass

+        $this->debug('in invoke_method, params:');

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

+        $this->debug("in invoke_method, calling '$this->methodname'");

+        if (!function_exists('call_user_func_array')) {

+            if ($class == '') {

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

+                $funcCall = "\$this->methodreturn = $this->methodname(";

+            } else {

+                if ($delim == '..') {

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

+                    $funcCall = "\$this->methodreturn = ".$class."::".$method."(";

+                } else {

+                    $this->debug('in invoke_method, calling instance method using eval()');

+                    // generate unique instance name

+                    $instname = "\$inst_".time();

+                    $funcCall = $instname." = new ".$class."(); ";

+                    $funcCall .= "\$this->methodreturn = ".$instname."->".$method."(";

+                }

+            }

+            if ($this->methodparams) {

+                foreach ($this->methodparams as $param) {

+                    if (is_array($param) || is_object($param)) {

+                        $this->fault('SOAP-ENV:Client', 'NuSOAP does not handle complexType parameters correctly when using eval; call_user_func_array must be available');

+                        return;

+                    }

+                    $funcCall .= "\"$param\",";

+                }

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

+            }

+            $funcCall .= ');';

+            $this->debug('in invoke_method, function call: '.$funcCall);

+            @eval($funcCall);

+        } else {

+            if ($class == '') {

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

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

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

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

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

+            } else {

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

+                $instance = new $class ();

+                $call_arg = array(&$instance, $method);

+            }

+            if (is_array($this->methodparams)) {

+                $this->methodreturn = call_user_func_array($call_arg, array_values($this->methodparams));

+            } else {

+                $this->methodreturn = call_user_func_array($call_arg, array());

+            }

+        }

         $this->debug('in invoke_method, methodreturn:');

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

-		$this->debug("in invoke_method, called method $this->methodname, received data of type ".gettype($this->methodreturn));

-	}

+        $this->debug("in invoke_method, called method $this->methodname, received data of type ".gettype($this->methodreturn));

+    }

 

-	/**

-	* serializes the return value from a PHP function into a full SOAP Envelope

-	*

-	* The following fields are set by this function (when successful)

-	*

-	* responseSOAP

-	*

-	* This sets the fault field on error

-	*

-	* @access   private

-	*/

-	function serialize_return() {

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

-		// if fault

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

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

-			$this->fault = $this->methodreturn;

-			return;

-		} elseif ($this->methodreturnisliteralxml) {

-			$return_val = $this->methodreturn;

-		// returned value(s)

-		} else {

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

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

-			if($this->wsdl){

-				$opParams = "";

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

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

-			    	$opParams = $this->methodreturn;

-			    } elseif (sizeof($this->opData['output']['parts']) == 1) {

-					$this->debug('exactly one output part, so wrap the method return in a simple array');

-					// TODO: verify that it is not already wrapped!

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

-					//	$this->debug('wrap in element named ' . $name);

-			    	//}

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

-			    }

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

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

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

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

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

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

-					return;

-				}

-			} else {

-				if (isset($this->methodreturn)) {

-					$return_val = $this->serialize_val($this->methodreturn, 'return');

-				} else {

-					$return_val = '';

-					$this->debug('in absence of WSDL, assume void return for backward compatibility');

-				}

-			}

-		}

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

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

+    /**

+     * serializes the return value from a PHP function into a full SOAP Envelope

+     *

+     * The following fields are set by this function (when successful)

+     *

+     * responseSOAP

+     *

+     * This sets the fault field on error

+     *

+     * @access   private

+     */

+    function serialize_return() {

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

+        // if fault

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

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

+            $this->fault = $this->methodreturn;

+            return;

+        } elseif ($this->methodreturnisliteralxml) {

+            $return_val = $this->methodreturn;

+        // returned value(s)

+        } else {

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

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

+            if($this->wsdl){

+                $opParams = "";

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

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

+                    $opParams = $this->methodreturn;

+                } elseif (sizeof($this->opData['output']['parts']) == 1) {

+                    $this->debug('exactly one output part, so wrap the method return in a simple array');

+                    // TODO: verify that it is not already wrapped!

+                    //foreach ($this->opData['output']['parts'] as $name => $type) {

+                    //	$this->debug('wrap in element named ' . $name);

+                    //}

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

+                }

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

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

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

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

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

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

+                    return;

+                }

+            } else {

+                if (isset($this->methodreturn)) {

+                    $return_val = $this->serialize_val($this->methodreturn, 'return');

+                } else {

+                    $return_val = '';

+                    $this->debug('in absence of WSDL, assume void return for backward compatibility');

+                }

+            }

+        }

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

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

 

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

-		if ($this->wsdl) {

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

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

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

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

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

-					if ($this->methodURI) {

-						$payload = '<ns1:'.$this->methodname.'Response xmlns:ns1="'.$this->methodURI.'">'.$return_val.'</ns1:'.$this->methodname."Response>";

-					} else {

-						$payload = '<'.$this->methodname.'Response>'.$return_val.'</'.$this->methodname.'Response>';

-					}

-				} else {

-					if ($this->methodURI) {

-						$payload = '<ns1:'.$this->methodname.'Response xmlns:ns1="'.$this->methodURI.'">'.$return_val.'</ns1:'.$this->methodname."Response>";

-					} else {

-						$payload = '<'.$this->methodname.'Response>'.$return_val.'</'.$this->methodname.'Response>';

-					}

-				}

-			} else {

-				$this->debug('style is not rpc for serialization: assume document');

-				$payload = $return_val;

-			}

-		} else {

-			$this->debug('do not have WSDL for serialization: assume rpc/encoded');

-			$payload = '<ns1:'.$this->methodname.'Response xmlns:ns1="'.$this->methodURI.'">'.$return_val.'</ns1:'.$this->methodname."Response>";

-		}

-		$this->result = 'successful';

-		if($this->wsdl){

-			//if($this->debug_flag){

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

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

+        if ($this->wsdl) {

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

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

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

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

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

+                    if ($this->methodURI) {

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

+                    } else {

+                        $payload = '<'.$this->methodname.'Response>'.$return_val.'</'.$this->methodname.'Response>';

+                    }

+                } else {

+                    if ($this->methodURI) {

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

+                    } else {

+                        $payload = '<'.$this->methodname.'Response>'.$return_val.'</'.$this->methodname.'Response>';

+                    }

+                }

+            } else {

+                $this->debug('style is not rpc for serialization: assume document');

+                $payload = $return_val;

+            }

+        } else {

+            $this->debug('do not have WSDL for serialization: assume rpc/encoded');

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

+        }

+        $this->result = 'successful';

+        if($this->wsdl){

+            //if($this->debug_flag){

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

             //	}

-			if (isset($this->opData['output']['encodingStyle'])) {

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

-			} else {

-				$encodingStyle = '';

-			}

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

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

-		} else {

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

-		}

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

-	}

+            if (isset($this->opData['output']['encodingStyle'])) {

+                $encodingStyle = $this->opData['output']['encodingStyle'];

+            } else {

+                $encodingStyle = '';

+            }

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

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

+        } else {

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

+        }

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

+    }

 

-	/**

-	* sends an HTTP response

-	*

-	* The following fields are set by this function (when successful)

-	*

-	* outgoing_headers

-	* response

-	*

-	* @access   private

-	*/

-	function send_response() {

-		$this->debug('Enter send_response');

-		if ($this->fault) {

-			$payload = $this->fault->serialize();

-			$this->outgoing_headers[] = "HTTP/1.0 500 Internal Server Error";

-			$this->outgoing_headers[] = "Status: 500 Internal Server Error";

-		} else {

-			$payload = $this->responseSOAP;

-			// Some combinations of PHP+Web server allow the Status

-			// to come through as a header.  Since OK is the default

-			// just do nothing.

-			// $this->outgoing_headers[] = "HTTP/1.0 200 OK";

-			// $this->outgoing_headers[] = "Status: 200 OK";

-		}

+    /**

+     * sends an HTTP response

+     *

+     * The following fields are set by this function (when successful)

+     *

+     * outgoing_headers

+     * response

+     *

+     * @access   private

+     */

+    function send_response() {

+        $this->debug('Enter send_response');

+        if ($this->fault) {

+            $payload = $this->fault->serialize();

+            $this->outgoing_headers[] = "HTTP/1.0 500 Internal Server Error";

+            $this->outgoing_headers[] = "Status: 500 Internal Server Error";

+        } else {

+            $payload = $this->responseSOAP;

+            // Some combinations of PHP+Web server allow the Status

+            // to come through as a header.  Since OK is the default

+            // just do nothing.

+            // $this->outgoing_headers[] = "HTTP/1.0 200 OK";

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

+        }

         // add debug data if in debug mode

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

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

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

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

+        }

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

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

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

+        // Let the Web server decide about this

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

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

+        $type = $this->getHTTPContentType();

+        $charset = $this->getHTTPContentTypeCharset();

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

+        //begin code to compress payload - by John

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

+        // this data.

+        if (strlen($payload) > 1024 && isset($this->headers) && isset($this->headers['accept-encoding'])) {

+            if (strstr($this->headers['accept-encoding'], 'gzip')) {

+                if (function_exists('gzencode')) {

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

+                        $payload .= "<!-- Content being gzipped -->";

+                    }

+                    $this->outgoing_headers[] = "Content-Encoding: gzip";

+                    $payload = gzencode($payload);

+                } else {

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

+                        $payload .= "<!-- Content will not be gzipped: no gzencode -->";

+                    }

+                }

+            } elseif (strstr($this->headers['accept-encoding'], 'deflate')) {

+                // Note: MSIE requires gzdeflate output (no Zlib header and checksum),

+                // instead of gzcompress output,

+                // which conflicts with HTTP 1.1 spec (http://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.5)

+                if (function_exists('gzdeflate')) {

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

+                        $payload .= "<!-- Content being deflated -->";

+                    }

+                    $this->outgoing_headers[] = "Content-Encoding: deflate";

+                    $payload = gzdeflate($payload);

+                } else {

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

+                        $payload .= "<!-- Content will not be deflated: no gzcompress -->";

+                    }

+                }

+            }

         }

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

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

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

-		// Let the Web server decide about this

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

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

-		$type = $this->getHTTPContentType();

-		$charset = $this->getHTTPContentTypeCharset();

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

-		//begin code to compress payload - by John

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

-		// this data.

-		if (strlen($payload) > 1024 && isset($this->headers) && isset($this->headers['accept-encoding'])) {

-			if (strstr($this->headers['accept-encoding'], 'gzip')) {

-				if (function_exists('gzencode')) {

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

-						$payload .= "<!-- Content being gzipped -->";

-					}

-					$this->outgoing_headers[] = "Content-Encoding: gzip";

-					$payload = gzencode($payload);

-				} else {

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

-						$payload .= "<!-- Content will not be gzipped: no gzencode -->";

-					}

-				}

-			} elseif (strstr($this->headers['accept-encoding'], 'deflate')) {

-				// Note: MSIE requires gzdeflate output (no Zlib header and checksum),

-				// instead of gzcompress output,

-				// which conflicts with HTTP 1.1 spec (http://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.5)

-				if (function_exists('gzdeflate')) {

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

-						$payload .= "<!-- Content being deflated -->";

-					}

-					$this->outgoing_headers[] = "Content-Encoding: deflate";

-					$payload = gzdeflate($payload);

-				} else {

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

-						$payload .= "<!-- Content will not be deflated: no gzcompress -->";

-					}

-				}

-			}

-		}

-		//end code

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

-		reset($this->outgoing_headers);

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

-			header($hdr, false);

-		}

-		print $payload;

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

-	}

+        //end code

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

+        reset($this->outgoing_headers);

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

+            header($hdr, false);

+        }

+        print $payload;

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

+    }

 

-	/**

-	* takes the value that was created by parsing the request

-	* and compares to the method's signature, if available.

-	*

-	* @param	string	$operation	The operation to be invoked

-	* @param	array	$request	The array of parameter values

-	* @return	boolean	Whether the operation was found

-	* @access   private

-	*/

-	function verify_method($operation,$request){

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

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

-				return true;

-			}

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

-			return true;

-		}

-		return false;

-	}

+    /**

+     * takes the value that was created by parsing the request

+     * and compares to the method's signature, if available.

+     *

+     * @param	string	$operation	The operation to be invoked

+     * @param	array	$request	The array of parameter values

+     * @return	boolean	Whether the operation was found

+     * @access   private

+     */

+    function verify_method($operation,$request){

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

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

+                return true;

+            }

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

+            return true;

+        }

+        return false;

+    }

 

-	/**

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

-	*/

+    /**

+     * 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 data of length ' . strlen($data) . ' headers:');

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

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

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

-			return false;

-    	}

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

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

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

-		// parse response, get soap parser obj

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

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

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

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

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

+            return false;

+        }

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

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

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

+        // parse response, get soap parser obj

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

 

-		// parser debug

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

-		// if fault occurred during message parsing

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

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

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

-		// else successfully parsed request into soapval object

-		} else {

-			// get/set methodname

-			$this->methodURI = $parser->root_struct_namespace;

-			$this->methodname = $parser->root_struct_name;

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

-			$this->debug('calling parser->get_soapbody()');

-			$this->methodparams = $parser->get_soapbody();

-			// get SOAP headers

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

-			// get SOAP Header

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

+        // parser debug

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

+        // if fault occurred during message parsing

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

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

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

+        // else successfully parsed request into soapval object

+        } else {

+            // get/set methodname

+            $this->methodURI = $parser->root_struct_namespace;

+            $this->methodname = $parser->root_struct_name;

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

+            $this->debug('calling parser->get_soapbody()');

+            $this->methodparams = $parser->get_soapbody();

+            // get SOAP headers

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

+            // get SOAP Header

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

             // add document for doclit support

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

-		}

-	 }

+        }

+        }

 

-	/**

-	* 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) {

-		return $soapmsg;

-	}

+    /**

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

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

-		return 'text/xml';

-	}

+    /**

+     * 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() {

+        return 'text/xml';

+    }

 

-	/**

-	* 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() {

-		return $this->soap_defencoding;

-	}

+    /**

+     * 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() {

+        return $this->soap_defencoding;

+    }

 

-	/**

-	* add a method to the dispatch map (this has been replaced by the register method)

-	*

-	* @param    string $methodname

-	* @param    string $in array of input values

-	* @param    string $out array of output values

-	* @access   public

-	* @deprecated

-	*/

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

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

-	}

+    /**

+     * add a method to the dispatch map (this has been replaced by the register method)

+     *

+     * @param    string $methodname

+     * @param    string $in array of input values

+     * @param    string $out array of output values

+     * @access   public

+     * @deprecated

+     */

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

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

+    }

 

-	/**

-	* register a service function with the server

-	*

-	* @param    string $name the name of the PHP function, class.method or class..method

-	* @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	mixed $namespace the element namespace for the method or false

-	* @param	mixed $soapaction the soapaction for the method or false

-	* @param	mixed $style optional (rpc|document) or false Note: when 'document' is specified, parameter and return wrappers are created for you automatically

-	* @param	mixed $use optional (encoded|literal) or false

-	* @param	string $documentation optional Description to include in WSDL

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

-	* @access   public

-	*/

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

-		global $HTTP_SERVER_VARS;

+    /**

+     * register a service function with the server

+     *

+     * @param    string $name the name of the PHP function, class.method or class..method

+     * @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	mixed $namespace the element namespace for the method or false

+     * @param	mixed $soapaction the soapaction for the method or false

+     * @param	mixed $style optional (rpc|document) or false Note: when 'document' is specified, parameter and return wrappers are created for you automatically

+     * @param	mixed $use optional (encoded|literal) or false

+     * @param	string $documentation optional Description to include in WSDL

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

+     * @access   public

+     */

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

+        global $HTTP_SERVER_VARS;

 

-		if($this->externalWSDLURL){

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

-		}

-		if (! $name) {

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

-		}

-		if (!is_array($in)) {

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

-		}

-		if (!is_array($out)) {

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

-		}

-		if(false == $namespace) {

-		}

-		if(false == $soapaction) {

-			if (isset($_SERVER)) {

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

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

-				$HTTPS = isset($_SERVER['HTTPS']) ? $_SERVER['HTTPS'] : (isset($HTTP_SERVER_VARS['HTTPS']) ? $HTTP_SERVER_VARS['HTTPS'] : 'off');

-			} elseif (isset($HTTP_SERVER_VARS)) {

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

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

-				$HTTPS = isset($HTTP_SERVER_VARS['HTTPS']) ? $HTTP_SERVER_VARS['HTTPS'] : 'off';

-			} else {

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

-			}

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

-        		$SCHEME = 'https';

-        	} else {

-        		$SCHEME = 'http';

-        	}

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

-		}

-		if(false == $style) {

-			$style = "rpc";

-		}

-		if(false == $use) {

-			$use = "encoded";

-		}

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

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

-		}

+        if($this->externalWSDLURL){

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

+        }

+        if (! $name) {

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

+        }

+        if (!is_array($in)) {

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

+        }

+        if (!is_array($out)) {

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

+        }

+        if(false == $namespace) {

+        }

+        if(false == $soapaction) {

+            if (isset($_SERVER)) {

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

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

+                $HTTPS = isset($_SERVER['HTTPS']) ? $_SERVER['HTTPS'] : (isset($HTTP_SERVER_VARS['HTTPS']) ? $HTTP_SERVER_VARS['HTTPS'] : 'off');

+            } elseif (isset($HTTP_SERVER_VARS)) {

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

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

+                $HTTPS = isset($HTTP_SERVER_VARS['HTTPS']) ? $HTTP_SERVER_VARS['HTTPS'] : 'off';

+            } else {

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

+            }

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

+                $SCHEME = 'https';

+            } else {

+                $SCHEME = 'http';

+            }

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

+        }

+        if(false == $style) {

+            $style = "rpc";

+        }

+        if(false == $use) {

+            $use = "encoded";

+        }

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

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

+        }

 

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

-	    'name' => $name,

-	    'in' => $in,

-	    'out' => $out,

-	    'namespace' => $namespace,

-	    'soapaction' => $soapaction,

-	    'style' => $style);

+        $this->operations[$name] = array(

+        'name' => $name,

+        'in' => $in,

+        'out' => $out,

+        'namespace' => $namespace,

+        'soapaction' => $soapaction,

+        'style' => $style);

         if($this->wsdl){

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

-	    }

-		return true;

-	}

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

+        }

+        return true;

+    }

 

-	/**

-	* Specify a fault to be returned to the client.

-	* This also acts as a flag to the server that a fault has occured.

-	*

-	* @param	string $faultcode

-	* @param	string $faultstring

-	* @param	string $faultactor

-	* @param	string $faultdetail

-	* @access   public

-	*/

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

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

-			$faultdetail = $this->getDebug();

-		}

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

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

-	}

+    /**

+     * Specify a fault to be returned to the client.

+     * This also acts as a flag to the server that a fault has occured.

+     *

+     * @param	string $faultcode

+     * @param	string $faultstring

+     * @param	string $faultactor

+     * @param	string $faultdetail

+     * @access   public

+     */

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

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

+            $faultdetail = $this->getDebug();

+        }

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

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

+    }

 

     /**

-    * Sets up wsdl object.

-    * Acts as a flag to enable internal WSDL generation

-    *

-    * @param string $serviceName, name of the service

-    * @param mixed $namespace optional 'tns' service namespace or false

-    * @param mixed $endpoint optional URL of service endpoint or false

-    * @param string $style optional (rpc|document) WSDL style (also specified by operation)

-    * @param string $transport optional SOAP transport

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

-    */

+     * Sets up wsdl object.

+     * Acts as a flag to enable internal WSDL generation

+     *

+     * @param string $serviceName, name of the service

+     * @param mixed $namespace optional 'tns' service namespace or false

+     * @param mixed $endpoint optional URL of service endpoint or false

+     * @param string $style optional (rpc|document) WSDL style (also specified by operation)

+     * @param string $transport optional SOAP transport

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

+     */

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

     {

-    	global $HTTP_SERVER_VARS;

+        global $HTTP_SERVER_VARS;

 

-		if (isset($_SERVER)) {

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

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

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

-			$HTTPS = isset($_SERVER['HTTPS']) ? $_SERVER['HTTPS'] : (isset($HTTP_SERVER_VARS['HTTPS']) ? $HTTP_SERVER_VARS['HTTPS'] : 'off');

-		} elseif (isset($HTTP_SERVER_VARS)) {

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

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

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

-			$HTTPS = isset($HTTP_SERVER_VARS['HTTPS']) ? $HTTP_SERVER_VARS['HTTPS'] : 'off';

-		} else {

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

-		}

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

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

-		if ($colon) {

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

-		}

-		if ($SERVER_PORT == 80) {

-			$SERVER_PORT = '';

-		} else {

-			$SERVER_PORT = ':' . $SERVER_PORT;

-		}

+        if (isset($_SERVER)) {

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

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

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

+            $HTTPS = isset($_SERVER['HTTPS']) ? $_SERVER['HTTPS'] : (isset($HTTP_SERVER_VARS['HTTPS']) ? $HTTP_SERVER_VARS['HTTPS'] : 'off');

+        } elseif (isset($HTTP_SERVER_VARS)) {

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

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

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

+            $HTTPS = isset($HTTP_SERVER_VARS['HTTPS']) ? $HTTP_SERVER_VARS['HTTPS'] : 'off';

+        } else {

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

+        }

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

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

+        if ($colon) {

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

+        }

+        if ($SERVER_PORT == 80) {

+            $SERVER_PORT = '';

+        } else {

+            $SERVER_PORT = ':' . $SERVER_PORT;

+        }

         if(false == $namespace) {

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

         }

 

         if(false == $endpoint) {

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

-        		$SCHEME = 'https';

-        	} else {

-        		$SCHEME = 'http';

-        	}

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

+                $SCHEME = 'https';

+            } else {

+                $SCHEME = 'http';

+            }

             $endpoint = "$SCHEME://$SERVER_NAME$SERVER_PORT$SCRIPT_NAME";

         }

 

@@ -1091,29 +1091,29 @@ 
             $schemaTargetNamespace = $namespace;

         }

 

-		$this->wsdl = new wsdl;

-		$this->wsdl->serviceName = $serviceName;

+        $this->wsdl = new wsdl;

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

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

-		$this->wsdl->namespaces['tns'] = $namespace;

-		$this->wsdl->namespaces['soap'] = 'http://schemas.xmlsoap.org/wsdl/soap/';

-		$this->wsdl->namespaces['wsdl'] = 'http://schemas.xmlsoap.org/wsdl/';

-		if ($schemaTargetNamespace != $namespace) {

-			$this->wsdl->namespaces['types'] = $schemaTargetNamespace;

-		}

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

+        $this->wsdl->namespaces['soap'] = 'http://schemas.xmlsoap.org/wsdl/soap/';

+        $this->wsdl->namespaces['wsdl'] = 'http://schemas.xmlsoap.org/wsdl/';

+        if ($schemaTargetNamespace != $namespace) {

+            $this->wsdl->namespaces['types'] = $schemaTargetNamespace;

+        }

         $this->wsdl->schemas[$schemaTargetNamespace][0] = new nusoap_xmlschema('', '', $this->wsdl->namespaces);

         if ($style == 'document') {

-	        $this->wsdl->schemas[$schemaTargetNamespace][0]->schemaInfo['elementFormDefault'] = 'qualified';

+            $this->wsdl->schemas[$schemaTargetNamespace][0]->schemaInfo['elementFormDefault'] = 'qualified';

         }

         $this->wsdl->schemas[$schemaTargetNamespace][0]->schemaTargetNamespace = $schemaTargetNamespace;

         $this->wsdl->schemas[$schemaTargetNamespace][0]->imports['http://schemas.xmlsoap.org/soap/encoding/'][0] = array('location' => '', 'loaded' => true);

         $this->wsdl->schemas[$schemaTargetNamespace][0]->imports['http://schemas.xmlsoap.org/wsdl/'][0] = array('location' => '', 'loaded' => true);

         $this->wsdl->bindings[$serviceName.'Binding'] = array(

-        	'name'=>$serviceName.'Binding',

+            'name'=>$serviceName.'Binding',

             'style'=>$style,

             'transport'=>$transport,

             'portType'=>$serviceName.'PortType');

         $this->wsdl->ports[$serviceName.'Port'] = array(

-        	'binding'=>$serviceName.'Binding',

+            'binding'=>$serviceName.'Binding',

             'location'=>$endpoint,

             'bindingType'=>'http://schemas.xmlsoap.org/wsdl/soap/');

     }

Spacing +85 added lines, -85 removed lines

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

 	* @access   public

 	*/

-	function nusoap_server($wsdl=false){

+	function nusoap_server($wsdl = false) {

 		parent::nusoap_base();

 		// turn on debugging?

 		global $debug;

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

 			foreach ($qs as $v) {

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

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

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

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

 				}

 			}

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

 			foreach ($qs as $v) {

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

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

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

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

 				}

 			}

 		}

 

 		// wsdl

-		if($wsdl){

+		if ($wsdl) {

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

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

 				$this->wsdl = $wsdl;

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

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

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

 			} else {

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

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

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

 				$this->externalWSDLURL = $wsdl;

 			}

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

 			$this->wsdl->clearDebug();

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

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

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

 			}

 		}

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

 	* @access   public

 	*/

-	function service($data){

+	function service($data) {

 		global $HTTP_SERVER_VARS;

 

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

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

 			$qs = '';

 		}

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

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

 

 		if ($rm == 'POST') {

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

 			$this->parse_request($data);

-			if (! $this->fault) {

+			if (!$this->fault) {

 				$this->invoke_method();

 			}

-			if (! $this->fault) {

+			if (!$this->fault) {

 				$this->serialize_return();

 			}

 			$this->send_response();

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

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

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

-			if ($this->externalWSDLURL){

+			if ($this->externalWSDLURL) {

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

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

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

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

 		$this->request = '';

 		$this->SOAPAction = '';

-		if(function_exists('getallheaders')){

+		if (function_exists('getallheaders')) {

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

 			$headers = getallheaders();

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

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

 				$k = strtolower($k);

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

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

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

 			}

 			// get SOAPAction header

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

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

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

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

 			}

 			// get the character encoding of the incoming request

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

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

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

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

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

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

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

 				} else {

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

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

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

 			}

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

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

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

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

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

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

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

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

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

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

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

 						} else {

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

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

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

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

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

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

 				} else {

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

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

 				}

 				if ($k == 'soapaction') {

 					// get SOAPAction header

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

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

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

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

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

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

 						} else {

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

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

 	* @access   private

 	*/

-	function parse_request($data='') {

+	function parse_request($data = '') {

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

 		$this->parse_http_headers();

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

 		// uncompress if necessary

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

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

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

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

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

 				if (function_exists('gzuncompress')) {

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

 	*/

 	function invoke_method() {

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

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

 

 		//

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

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

 		if ($this->wsdl) {

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

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

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

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

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

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

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

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

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

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

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

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

 			} else {

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

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

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

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

 				return;

 			}

 		} else {

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

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

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

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

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

 				return;

 			}

 		} else {

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

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

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

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

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

 				return;

 			}

 		}

 

 		// evaluate message, getting back parameters

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

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

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

 			// debug

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

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

 			// return fault

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

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

 			return;

 		}

 

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

 			if ($class == '') {

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

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

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

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

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

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

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

 			} else {

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

-				$instance = new $class ();

+				$instance = new $class();

 				$call_arg = array(&$instance, $method);

 			}

 			if (is_array($this->methodparams)) {

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

 	*/

 	function serialize_return() {

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

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

 		// if fault

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

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

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

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

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

-			if($this->wsdl){

+			if ($this->wsdl) {

 				$opParams = "";

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

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

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

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

 			    }

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

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

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

 			    $this->wsdl->clearDebug();

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

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

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

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

 					return;

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

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

 		if ($this->wsdl) {

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

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

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

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

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

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

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

 					if ($this->methodURI) {

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

 		}

 		$this->result = 'successful';

-		if($this->wsdl){

+		if ($this->wsdl) {

 			//if($this->debug_flag){

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

             //	}

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

 			}

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

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

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

 		} else {

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

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

 		}

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

 	}

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

 		}

         // add debug data if in debug mode

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

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

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

         }

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

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

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

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

 		// Let the Web server decide about this

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

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

 		$type = $this->getHTTPContentType();

 		$charset = $this->getHTTPContentTypeCharset();

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

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

 		//begin code to compress payload - by John

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

 		// this data.

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

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

 		reset($this->outgoing_headers);

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

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

 			header($hdr, false);

 		}

 		print $payload;

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

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

 	}

 

 	/**

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

 	* @access   private

 	*/

-	function verify_method($operation,$request){

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

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

+	function verify_method($operation, $request) {

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

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

 				return true;

 			}

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

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

 			return true;

 		}

 		return false;

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

 	*/

     function parseRequest($headers, $data) {

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

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

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

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

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

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

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

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

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

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

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

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

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

 			} else {

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

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

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

 		}

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

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

 		// parse response, get soap parser obj

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

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

 

 		// parser debug

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

 		// if fault occurred during message parsing

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

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

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

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

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

 		// else successfully parsed request into soapval object

 		} else {

 			// get/set methodname

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

 	* @deprecated

 	*/

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

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

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

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

 	}

 

 	/**

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

 	* @access   public

 	*/

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

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

 		global $HTTP_SERVER_VARS;

 

-		if($this->externalWSDLURL){

+		if ($this->externalWSDLURL) {

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

 		}

-		if (! $name) {

+		if (!$name) {

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

 		}

 		if (!is_array($in)) {

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

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

 		}

-		if(false == $namespace) {

+		if (false == $namespace) {

 		}

-		if(false == $soapaction) {

+		if (false == $soapaction) {

 			if (isset($_SERVER)) {

 				$SERVER_NAME = $_SERVER['SERVER_NAME'];

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

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

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

 		}

-		if(false == $style) {

+		if (false == $style) {

 			$style = "rpc";

 		}

-		if(false == $use) {

+		if (false == $use) {

 			$use = "encoded";

 		}

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

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

 	    'soapaction' => $soapaction,

 	    'style' => $style);

-        if($this->wsdl){

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

+        if ($this->wsdl) {

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

 	    }

 		return true;

 	}

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

 	* @access   public

 	*/

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

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

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

 			$faultdetail = $this->getDebug();

 		}

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

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

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

 	}

 

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

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

     */

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

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

     {

     	global $HTTP_SERVER_VARS;

 

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

 		}

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

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

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

 		if ($colon) {

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

 		}

 		if ($SERVER_PORT == 80) {

 			$SERVER_PORT = '';

 		} else {

-			$SERVER_PORT = ':' . $SERVER_PORT;

+			$SERVER_PORT = ':'.$SERVER_PORT;

 		}

-        if(false == $namespace) {

+        if (false == $namespace) {

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

         }

 

-        if(false == $endpoint) {

+        if (false == $endpoint) {

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

         		$SCHEME = 'https';

         	} else {

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

         }

 

-        if(false == $schemaTargetNamespace) {

+        if (false == $schemaTargetNamespace) {

             $schemaTargetNamespace = $namespace;

         }

 

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

Doc Comments +6 added lines, -6 removed lines

@@ -169,10 +169,6 @@ 
 	/**

 	* 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

@@ -731,7 +727,7 @@ 
 	*

 	* @param    string $data message data

 	* @param	array $cookies cookies to send

-	* @return	boolean	true if OK, false if problem

+	* @return	boolean|null	true if OK, false if problem

 	* @access   private

 	*/

 	function sendRequest($data, $cookies = NULL) {

@@ -1166,7 +1162,7 @@ 
 	 * 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)

+	 * @param	string $charset character set used for encoding (or false)

 	 * @access	public

 	 */

 	function setContentType($type, $charset = false) {

@@ -1199,6 +1195,10 @@ 
 	/*

 	 * TODO: allow a Set-Cookie string to be parsed into multiple cookies

 	 */

+
+	/**
+	 * @param string $cookie_str
+	 */
 	function parseCookie($cookie_str) {

 		$cookie_str = str_replace('; ', ';', $cookie_str) . ';';

 		$data = preg_split('/;/', $cookie_str);

Indentation +1168 added lines, -1168 removed lines

@@ -14,171 +14,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

+    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 soap_transport_http($url, $curl_options = NULL, $use_curl = false){

-		parent::nusoap_base();

-		$this->debug("ctor url=$url use_curl=$use_curl curl_options:");

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

-		$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].')');

-	}

+    /**

+     * 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 soap_transport_http($url, $curl_options = NULL, $use_curl = false){

+        parent::nusoap_base();

+        $this->debug("ctor url=$url use_curl=$use_curl curl_options:");

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

+        $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 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");

-	}

+    /**

+     * 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]);

-		}

-	}

+    /**

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

+    /**

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

-		}

+        $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'] != ''){

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

-			}

-		}

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

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

-		}

+        // 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']) : '');

-		}

-	}

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

-	}

+    /**

+     * 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.

+    /**

+     * 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')) {

@@ -187,1120 +187,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'];

-		}

+        $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');

-		}

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

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

-		}

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

-		}

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

+        // 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('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->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->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);

-		}

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

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

-	  }

-	}

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

+    /**

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

-				}

+        $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;

-				}

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

-	}

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

-	}

+    /**

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

+    /**

+     * 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)

+                // 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 = unq(username-value) ":" unq(realm-value) ":" passwd

+                $A1 = $username. ':' . (isset($digestRequest['realm']) ? $digestRequest['realm'] : '') . ':' . $password;

 	

-				// H(A1) = MD5(A1)

-				$HA1 = md5($A1);

+                // H(A1) = MD5(A1)

+                $HA1 = md5($A1);

 	

-				// A2 = Method ":" digest-uri-value

-				$A2 = $this->request_method . ':' . $this->digest_uri;

+                // A2 = Method ":" digest-uri-value

+                $A2 = $this->request_method . ':' . $this->digest_uri;

 	

-				// H(A2)

-				$HA2 =  md5($A2);

+                // 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) ) > <">

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

-				}

+                $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);

+                $hashedDigest = md5($unhashedDigest);

 	

-				$opaque = '';	

-				if (isset($digestRequest['opaque'])) {

-					$opaque = ', opaque="' . $digestRequest['opaque'] . '"';

-				}

+                $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;

-	}

+                $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 . '"');

-	}

+    /**

+     * 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;

-		}

-	}

+    /**

+     * 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');

-		}

-	}

+    /**

+     * 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;

-		}

+    /**

+     * 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;

-	}

+        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 = '';

+    /**

+     * 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);

+        // 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;

-			}

+            // 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);

+                // 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;

-	}

+                $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.

+    /**

+     * 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));

-		}

+        // 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";

+        // 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";

-		}

+        // 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";

-		}

+        // 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";

+        // header/body separator

+        $this->outgoing_payload .= "\r\n";

 		

-		// add data

-		$this->outgoing_payload .= $data;

-	}

+        // 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')));

+    /**

+     * 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);

+        // 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);

-		}

+        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;

-	  }

-	}

+        $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 = '';

+    /**

+     * 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)){

+        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;

-			}

+            // 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));

+            $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;

-			}

+            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;

-			}

-		}

+            $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');

+        // 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');

-		}

+        // 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;

-		}

+        // connection was closed unexpectedly

+        if($this->incoming_payload == ''){

+            $this->setError('no response from server');

+            return false;

+        }

 		

-		// decode transfer-encoding

+        // 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);

+        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));

-			}

-		}

+        // 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));

-				}

-			}

-		}

+        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;

-			}

-		}

-	  }

+        // 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] : '';

+        $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['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']);

+            // 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]);

- 				}

+                    // 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;

- 		}

+                // 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;

-		}

+        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');

-		}

+        // 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;

-		}

+        if(strlen($data) == 0){

+            $this->debug('no data after headers!');

+            $this->setError('no data present after HTTP headers');

+            return false;

+        }

 		

-		return $data;

-	}

+        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 : ''));

-	}

+    /**

+     * 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;

-	}

+    /**

+     * 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

-	 */

-	/*

+    /**

+     * 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];

+    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 = '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 = '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 = '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;

-		}

+        $cookie_param = ';secure;';

+        if (strpos($cookie_str, $cookie_param) !== FALSE) {

+            $secure = true;

+        } else {

+            $secure = false;

+        }

 

-		$sep_pos = strpos($value_str, '=');

+        $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;

-	}

+        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;

-  }

+    /**

+     * 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

@@ -29,18 +29,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'

@@ -57,7 +57,7 @@ 
 	* @param boolean $use_curl Whether to try to force cURL use

 	* @access public

 	*/

-	function soap_transport_http($url, $curl_options = NULL, $use_curl = false){

+	function soap_transport_http($url, $curl_options = NULL, $use_curl = false) {

 		parent::nusoap_base();

 		$this->debug("ctor url=$url use_curl=$use_curl curl_options:");

 		$this->appendDebug($this->varDump($curl_options));

@@ -66,7 +66,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].')');

 	}

 

@@ -118,19 +118,19 @@ 
 		$this->url = $url;

 

 		$u = parse_url($url);

-		foreach($u as $k => $v){

+		foreach ($u as $k => $v) {

 			$this->debug("parsed URL $k = $v");

 			$this->$k = $v;

 		}

 		

 		// add any GET params to path

-		if(isset($u['query']) && $u['query'] != ''){

-            $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;

@@ -174,7 +174,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

@@ -198,7 +198,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;

@@ -209,20 +209,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 {

@@ -234,8 +234,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;

@@ -394,8 +394,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;

 	  }

 	}

@@ -410,7 +410,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));

 

@@ -420,12 +420,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;

 				}

 				

@@ -451,7 +451,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);

 	}

 	

@@ -472,7 +472,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;

@@ -480,16 +480,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:

@@ -506,19 +506,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;

@@ -540,7 +540,7 @@ 
 	* @access   public

 	*/

 	function setSOAPAction($soapaction) {

-		$this->setHeader('SOAPAction', '"' . $soapaction . '"');

+		$this->setHeader('SOAPAction', '"'.$soapaction.'"');

 	}

 	

 	/**

@@ -549,7 +549,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);

@@ -602,7 +602,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',

@@ -628,7 +628,7 @@ 
 	* @access   public

 	* @deprecated

 	*/

-	function decodeChunked($buffer, $lb){

+	function decodeChunked($buffer, $lb) {

 		// length := 0

 		$length = 0;

 		$new = '';

@@ -640,17 +640,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);

@@ -658,7 +658,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

@@ -670,8 +670,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;

@@ -706,7 +706,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";

@@ -743,12 +743,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

@@ -757,7 +757,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 {

@@ -765,7 +765,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');

@@ -791,62 +791,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') {

@@ -854,20 +854,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'])) {

@@ -875,7 +875,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");

 		}

@@ -887,8 +887,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;

 				}

@@ -903,8 +903,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;

 				}

@@ -917,8 +917,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;

 				}

@@ -927,21 +927,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;

 		}

@@ -967,7 +967,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);

@@ -987,44 +987,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') {

@@ -1032,14 +1032,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;

 			}

 		}

 	  }

@@ -1052,7 +1052,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;

@@ -1060,7 +1060,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

@@ -1095,10 +1095,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

@@ -1107,13 +1107,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 {

@@ -1123,13 +1123,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 {

@@ -1146,14 +1146,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;

@@ -1170,7 +1170,7 @@ 
 	 * @access	public

 	 */

 	function setContentType($type, $charset = false) {

-		$this->setHeader('Content-Type', $type . ($charset ? '; charset=' . $charset : ''));

+		$this->setHeader('Content-Type', $type.($charset ? '; charset='.$charset : ''));

 	}

 

 	/**

@@ -1179,7 +1179,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;

 		}

@@ -1200,7 +1200,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];

 

@@ -1224,7 +1224,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 {

@@ -1243,7 +1243,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,

@@ -1263,40 +1263,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;

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;