chamilo / chamilo-lms

src/Chamilo/CourseBundle/Component/CourseCopy/Resources/LinkCategory.php

Spacing +2 added lines, -2 removed lines

@@ -29,9 +29,9 @@
      * @param string $title
      * @param string $description
      */
-    public function __construct($id,$title,$description,$display_order)
+    public function __construct($id, $title, $description, $display_order)
     {
-        parent::__construct($id,RESOURCE_LINKCATEGORY);
+        parent::__construct($id, RESOURCE_LINKCATEGORY);
         $this->title = $title;
         $this->description = $description;
         $this->display_order = $display_order;

main/coursecopy/copy_course_session_selected.php

Spacing +38 added lines, -38 removed lines

@@ -47,7 +47,7 @@ 
 
 $this_section = SECTION_COURSES;
 $nameTools = get_lang('CopyCourse');
-$returnLink = api_get_path(WEB_CODE_PATH) . 'course_info/maintenance_coach.php?' . api_get_cidreq();
+$returnLink = api_get_path(WEB_CODE_PATH).'course_info/maintenance_coach.php?'.api_get_cidreq();
 $interbreadcrumb[] = array(
     'url' => $returnLink,
     'name' => get_lang('Maintenance')
@@ -73,29 +73,29 @@ 
     $attrs = '';
     if (count($attr) > 0) {
         foreach ($attr as $key => $value) {
-            $attrs .= ' ' . $key . '="' . $value . '"';
+            $attrs .= ' '.$key.'="'.$value.'"';
         }
     }
-    $output = '<select name="' . $name . '" ' . $attrs . '>';
+    $output = '<select name="'.$name.'" '.$attrs.'>';
 
     if (count($sessions) == 0) {
-        $output .= '<option value = "0">' . get_lang(
+        $output .= '<option value = "0">'.get_lang(
                 'ThereIsNotStillASession'
-            ) . '</option>';
+            ).'</option>';
     } else {
-        $output .= '<option value = "0">' . get_lang(
+        $output .= '<option value = "0">'.get_lang(
                 'SelectASession'
-            ) . '</option>';
+            ).'</option>';
     }
 
     if (is_array($sessions)) {
         foreach ($sessions as $session) {
             $category_name = '';
             if (!empty($session['category_name'])) {
-                $category_name = ' (' . $session['category_name'] . ')';
+                $category_name = ' ('.$session['category_name'].')';
             }
 
-            $output .= '<option value="' . $session['id'] . '">' . $session['name'] . ' ' . $category_name . '</option>';
+            $output .= '<option value="'.$session['id'].'">'.$session['name'].' '.$category_name.'</option>';
         }
     }
     $output .= '</select>';
@@ -120,43 +120,43 @@ 
     // Actions
     $html .= '<div class="actions">';
     // Link back to the documents overview
-    $html .= '<a href="' . $returnLink . '">' . Display::return_icon(
-            'back.png', get_lang('BackTo') . ' ' . get_lang('Maintenance'), '', ICON_SIZE_MEDIUM
-        ) . '</a>';
+    $html .= '<a href="'.$returnLink.'">'.Display::return_icon(
+            'back.png', get_lang('BackTo').' '.get_lang('Maintenance'), '', ICON_SIZE_MEDIUM
+        ).'</a>';
     $html .= '</div>';
 
     $html .= Display::return_message(
             get_lang('CopyCourseFromSessionToSessionExplanation')
     );
 
-    $html .= '<form name="formulaire" method="post" action="' . api_get_self(
-        ) . '?' . api_get_cidreq() . '" >';
+    $html .= '<form name="formulaire" method="post" action="'.api_get_self(
+        ).'?'.api_get_cidreq().'" >';
     $html .= '<table border="0" cellpadding="5" cellspacing="0" width="100%">';
 
     // Source
-    $html .= '<tr><td width="15%"><b>' . get_lang(
+    $html .= '<tr><td width="15%"><b>'.get_lang(
             'OriginCoursesFromSession'
-        ) . ':</b></td>';
-    $html .= '<td width="10%" align="left">' . api_get_session_name(
+        ).':</b></td>';
+    $html .= '<td width="10%" align="left">'.api_get_session_name(
             $sessionId
-        ) . '</td>';
+        ).'</td>';
     $html .= '<td width="50%">';
-    $html .= "{$courseInfo['title']} ({$courseInfo['code']})" . '</td></tr>';
+    $html .= "{$courseInfo['title']} ({$courseInfo['code']})".'</td></tr>';
 
     // Destination
-    $html .= '<tr><td width="15%"><b>' . get_lang(
+    $html .= '<tr><td width="15%"><b>'.get_lang(
             'DestinationCoursesFromSession'
-        ) . ':</b></td>';
+        ).':</b></td>';
     $html .= '<td width="10%" align="left"><div id="ajax_sessions_list_destination">';
     $html .= '<select name="sessions_list_destination" onchange="javascript: xajax_searchCourses(this.value,\'destination\');">';
     if (empty($sessions)) {
-        $html .= '<option value = "0">' . get_lang(
+        $html .= '<option value = "0">'.get_lang(
                 'ThereIsNotStillASession'
-            ) . '</option>';
+            ).'</option>';
     } else {
-        $html .= '<option value = "0">' . get_lang(
+        $html .= '<option value = "0">'.get_lang(
                 'SelectASession'
-            ) . '</option>';
+            ).'</option>';
         foreach ($sessions as $session) {
             if ($session['id'] == $sessionId) {
                 continue;
@@ -166,7 +166,7 @@ 
                 continue;
             }
 
-            $html .= '<option value="' . $session['id'] . '">' . $session['name'] . '</option>';
+            $html .= '<option value="'.$session['id'].'">'.$session['name'].'</option>';
         }
     }
 
@@ -178,17 +178,17 @@ 
     $html .= '</tr></table>';
 
     $html .= "<fieldset>";
-    $html .= '<legend>' . get_lang('TypeOfCopy') . ' <small>(' . get_lang('CopyOnlySessionItems') . ')</small></legend>';
+    $html .= '<legend>'.get_lang('TypeOfCopy').' <small>('.get_lang('CopyOnlySessionItems').')</small></legend>';
     $html .= '<label class="radio"><input type="radio" id="copy_option_1" name="copy_option" value="full_copy" checked="checked"/>';
-    $html .= get_lang('FullCopy') . '</label>';
+    $html .= get_lang('FullCopy').'</label>';
     $html .= '<label class="radio"><input type="radio" id="copy_option_2" name="copy_option" value="select_items"/>';
-    $html .= ' ' . get_lang('LetMeSelectItems') . '</label><br/>';
+    $html .= ' '.get_lang('LetMeSelectItems').'</label><br/>';
 
     $html .= "</fieldset>";
 
-    $html .= '<button class="save" type="submit" onclick="javascript:if(!confirm(' . "'" . addslashes(
+    $html .= '<button class="save" type="submit" onclick="javascript:if(!confirm('."'".addslashes(
             api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES)
-        ) . "'" . ')) return false;">' . get_lang('CopyCourse') . '</button>';
+        )."'".')) return false;">'.get_lang('CopyCourse').'</button>';
     $html .= '</form>';
     echo $html;
 }
@@ -214,10 +214,10 @@ 
 
             $courseTitle = str_replace("'", "\'", $course['title']);
 
-            $return .= '<option value="' . $course['code'] . '" title="' . @htmlspecialchars(
-                    $course['title'] . ' (' . $course['visual_code'] . ')', ENT_QUOTES, api_get_system_encoding()
-                ) . '">' .
-                $course['title'] . ' (' . $course['visual_code'] . ')</option>';
+            $return .= '<option value="'.$course['code'].'" title="'.@htmlspecialchars(
+                    $course['title'].' ('.$course['visual_code'].')', ENT_QUOTES, api_get_system_encoding()
+                ).'">'.
+                $course['title'].' ('.$course['visual_code'].')</option>';
         }
         $return .= '</select>';
         $_SESSION['course_list_destination'] = $course_list_destination;
@@ -235,7 +235,7 @@ 
 /* HTML head extra */
 
 $htmlHeadXtra[] = $xajax->getJavascript(
-    api_get_path(WEB_LIBRARY_PATH) . 'xajax/'
+    api_get_path(WEB_LIBRARY_PATH).'xajax/'
 );
 $htmlHeadXtra[] = '<script>
 	function checkSelected(id_select,id_radio,id_title,id_destination) {
@@ -380,7 +380,7 @@ 
 
         CourseSelectForm :: display_form($course, $hiddenFields, true);
 
-        echo '<div style="float:right"><a href="javascript:window.history.go(-1);">' .
+        echo '<div style="float:right"><a href="javascript:window.history.go(-1);">'.
             Display::return_icon(
                 'back.png',
                 get_lang('Back').' '.get_lang('To').' '.get_lang(
@@ -388,7 +388,7 @@ 
                 ),
                 array('style' => 'vertical-align:middle')
             ).
-            get_lang('Back') . '</a></div>';
+            get_lang('Back').'</a></div>';
     } else {
         Display::display_error_message(
             get_lang('You must select a course from original session and select a destination session')

main/survey/create_new_survey.php

Spacing +2 added lines, -2 removed lines

@@ -100,7 +100,7 @@ 
 $form = new FormValidator(
     'survey',
     'post',
-    api_get_self().'?action='.Security::remove_XSS($_GET['action']).'&survey_id='.$survey_id. '&' . api_get_cidreq()
+    api_get_self().'?action='.Security::remove_XSS($_GET['action']).'&survey_id='.$survey_id.'&'.api_get_cidreq()
 );
 
 $form->addElement('header', $tool_name);
@@ -216,7 +216,7 @@ 
             foreach ($field_list as $key => & $field) {
                 if ($field['visibility'] == 1) {
                     $form->addElement('checkbox', 'profile_'.$key, ' ', '  '.$field['name']);
-                    $input_name_list.= 'profile_'.$key.',';
+                    $input_name_list .= 'profile_'.$key.',';
                 }
             }
 

src/Chamilo/CoreBundle/Entity/Language.php

Doc Comments +1 added lines, -1 removed lines

@@ -230,7 +230,7 @@
     /**
      * Get id
      *
-     * @return boolean
+     * @return integer
      */
     public function getId()
     {

plugin/buycourses/src/buy_course_plugin.class.php

Spacing +17 added lines, -17 removed lines

@@ -91,7 +91,7 @@ 
             return false;

         }

 

-        require_once api_get_path(SYS_PLUGIN_PATH) . 'buycourses/database.php';

+        require_once api_get_path(SYS_PLUGIN_PATH).'buycourses/database.php';

     }

 

     /**

@@ -135,10 +135,10 @@ 
             $item = $this->getItemByProduct(intval($productId), $productType);

             $return['html'] = '<div class="buycourses-price">';

             if ($item) {

-                $return['html'] .= '<span class="label label-primary"><b>'. $item['iso_code'] .' ' . $item['price'] . '</b></span>';

+                $return['html'] .= '<span class="label label-primary"><b>'.$item['iso_code'].' '.$item['price'].'</b></span>';

                 $return['verificator'] = true;

             } else {

-                $return['html'] .= '<span class="label label-primary"><b>'. $this->get_lang('Free'). '</b></span>';

+                $return['html'] .= '<span class="label label-primary"><b>'.$this->get_lang('Free').'</b></span>';

                 $return['verificator'] = false;

             }

             $return['html'] .= '</div>';

@@ -156,15 +156,15 @@ 
      * @return string $html

      */

     public function returnBuyCourseButton($productId, $productType) {

-        $url = api_get_path(WEB_PLUGIN_PATH) .

-            'buycourses/src/process.php?i=' .

-            intval($productId) .

-            '&t=' .

+        $url = api_get_path(WEB_PLUGIN_PATH).

+            'buycourses/src/process.php?i='.

+            intval($productId).

+            '&t='.

             $productType

         ;

 

-        $html = ' <a class="btn btn-success btn-sm" title="' . $this->get_lang('Buy') . '" href="' . $url . '">' .

-            Display::returnFontAwesomeIcon('fa fa-shopping-cart') . '</a>';

+        $html = ' <a class="btn btn-success btn-sm" title="'.$this->get_lang('Buy').'" href="'.$url.'">'.

+            Display::returnFontAwesomeIcon('fa fa-shopping-cart').'</a>';

 

         return $html;

     }

@@ -709,7 +709,7 @@ 
         );

 

         if (!empty($sessionImage)) {

-            $sessionInfo['image'] = api_get_path(WEB_UPLOAD_PATH) . $sessionImage['value'];

+            $sessionInfo['image'] = api_get_path(WEB_UPLOAD_PATH).$sessionImage['value'];

         }

 

         $sessionCourses = $session->getCourses();

@@ -1151,7 +1151,7 @@ 
 

         $str = '';

 

-        srand((double)microtime() * 1000000);

+        srand((double) microtime() * 1000000);

 

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

             $numbers = rand(0, strlen($salt) - 1);

@@ -1498,8 +1498,8 @@ 
      */

     public function getPayouts($status = self::PAYOUT_STATUS_PENDING, $payoutId = false, $userId = false)

     {

-        $condition = ($payoutId) ? 'AND p.id = '. intval($payoutId) : '';

-        $condition2 = ($userId) ? ' AND p.user_id = ' . intval($userId) : '';

+        $condition = ($payoutId) ? 'AND p.id = '.intval($payoutId) : '';

+        $condition2 = ($userId) ? ' AND p.user_id = '.intval($userId) : '';

         $typeResult = ($condition) ? 'first' : 'all';

         $payoutsTable = Database::get_main_table(BuyCoursesPlugin::TABLE_PAYPAL_PAYOUTS);

         $saleTable = Database::get_main_table(BuyCoursesPlugin::TABLE_SALE);

@@ -1526,14 +1526,14 @@ 
             INNER JOIN $saleTable s ON s.id = p.sale_id

             INNER JOIN $currencyTable c ON s.currency_id = c.id

             LEFT JOIN  $extraFieldValues efv ON p.user_id = efv.item_id 

-            AND field_id = " . intval($paypalExtraField['id']) . "

+            AND field_id = ".intval($paypalExtraField['id'])."

         ";

 

         $payouts = Database::select(

             "p.* , u.firstname, u.lastname, efv.value as paypal_account, s.reference as sale_reference, s.price as item_price, c.iso_code",

             "$payoutsTable p $innerJoins",

             [

-                'where' => ['p.status = ? '.$condition . ' ' .$condition2 => $status]

+                'where' => ['p.status = ? '.$condition.' '.$condition2 => $status]

             ],

             $typeResult

         );

@@ -1597,7 +1597,7 @@ 
         $platformCommission = $this->getPlatformCommission();

 

         $sale = $this->getSale($saleId);

-        $teachersCommission = number_format((floatval($sale['price']) * intval($platformCommission['commission']))/100, 2);

+        $teachersCommission = number_format((floatval($sale['price']) * intval($platformCommission['commission'])) / 100, 2);

 

 

         $beneficiaries = $this->getBeneficiariesBySale($saleId);

@@ -1609,7 +1609,7 @@ 
                     'payout_date' => getdate(),

                     'sale_id' => intval($saleId),

                     'user_id' => $beneficiary['user_id'],

-                    'commission' => number_format((floatval($teachersCommission) * intval($beneficiary['commissions']))/100, 2),

+                    'commission' => number_format((floatval($teachersCommission) * intval($beneficiary['commissions'])) / 100, 2),

                     'status' => self::PAYOUT_STATUS_PENDING

                 ]

             );

Doc Comments +13 added lines, -13 removed lines

@@ -45,7 +45,7 @@ 
 

     /**

      *

-     * @return StaticPlugin

+     * @return BuyCoursesPlugin

      */

     static function create()

     {

@@ -268,7 +268,7 @@ 
     /**

      * Save a transfer account information

      * @param array $params The transfer account

-     * @return int Rows affected. Otherwise return false

+     * @return false|string Rows affected. Otherwise return false

      */

     public function saveTransferAccount($params)

     {

@@ -680,7 +680,7 @@ 
     /**

      * Get session info

      * @param array $sessionId The session ID

-     * @return array

+     * @return Session

      */

     public function getSessionInfo($sessionId)

     {

@@ -773,7 +773,7 @@ 
      * Register a sale

      * @param int $itemId The product ID

      * @param int $paymentType The payment type

-     * @return boolean

+     * @return false|string

      */

     public function registerSale($itemId, $paymentType)

     {

@@ -955,7 +955,7 @@ 
 

     /**

      * Get payment types

-     * @return array

+     * @return string[]

      */

     public function getPaymentTypes()

     {

@@ -994,7 +994,7 @@ 
 

     /**

      * Get the statuses for sales

-     * @return array

+     * @return string[]

      */

     public function getSaleStatuses()

     {

@@ -1007,7 +1007,7 @@ 
 

     /**

      * Get the statuses for Payouts

-     * @return array

+     * @return string[]

      */

     public function getPayoutStatuses()

     {

@@ -1020,7 +1020,7 @@ 
 

     /**

      * Get the list of product types

-     * @return array

+     * @return string[]

      */

     public function getProductTypes()

     {

@@ -1401,7 +1401,7 @@ 
     /**

      * Register a item

      * @param array $itemData The item data

-     * @return int The item ID. Otherwise return false

+     * @return false|string The item ID. Otherwise return false

      */

     public function registerItem(array $itemData)

     {

@@ -1559,7 +1559,7 @@ 
     /**

      * Verify if the beneficiary have a paypal account

      * @param int $userId

-     * @return true if the user have a paypal account, false if not

+     * @return boolean if the user have a paypal account, false if not

      */

     public function verifyPaypalAccountByBeneficiary($userId)

     {

@@ -1681,7 +1681,7 @@ 
     /**

      * Register addicional service

      * @param array params $service

-     * @return mixed response

+     * @return string|false response

      */

     public function storeService($service)

     {

@@ -1838,7 +1838,7 @@ 
 

     /**

      * Get the statuses for sales

-     * @return array

+     * @return string[]

      */

     public function getServiceSaleStatuses()

     {

@@ -2094,7 +2094,7 @@ 
      * @param int $paymentType The payment type

      * @param int $infoSelect The ID for Service Type

      * @param int $trial trial mode

-     * @return boolean

+     * @return false|string

      */

     public function registerServiceSale($serviceId, $paymentType, $infoSelect, $trial = null)

     {

main/coursecopy/create_backup.php

Spacing +3 added lines, -3 removed lines

@@ -70,8 +70,8 @@ 
 
     $zip_file = CourseArchiver::write_course($course);
     Display::display_confirmation_message(get_lang('BackupCreated'));
-    echo '<br /><a class="btn btn-primary btn-large" href="' . api_get_path(WEB_CODE_PATH) . 'course_info/download.php?archive=' . $zip_file . '&' . api_get_cidreq() . '">
-    ' . get_lang('Download') . '</a>';
+    echo '<br /><a class="btn btn-primary btn-large" href="'.api_get_path(WEB_CODE_PATH).'course_info/download.php?archive='.$zip_file.'&'.api_get_cidreq().'">
+    ' . get_lang('Download').'</a>';
 
 } elseif (Security::check_token('post') && (
         isset($_POST['backup_option']) &&
@@ -96,7 +96,7 @@ 
         $form = new FormValidator(
             'create_backup_form',
             'post',
-            api_get_self() . '?' . api_get_cidreq()
+            api_get_self().'?'.api_get_cidreq()
         );
         $form->addElement('header', get_lang('SelectOptionForBackup'));
         $form->addElement('radio', 'backup_option', '', get_lang('CreateFullBackup'), 'full_backup');

main/forum/forumfunction.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -3054,7 +3054,7 @@
  * @param integer $thread_qualify
  * @param integer $qualify_time
  * @param integer $session_id
- * @return array optional
+ * @return string|null optional
  * @author Isaac Flores <isaac.flores@dokeos.com>, U.N.A.S University
  * @version October 2008, dokeos  1.8.6
  */

Spacing +72 added lines, -72 removed lines

@@ -64,10 +64,10 @@ 
         var l = $(this);
         var id = l.closest("tr").attr("id");
         var filename = l.closest("tr").find(".attachFilename").html();
-        if (confirm("' . get_lang('AreYouSureToDeleteJS') . '", filename)) {
+        if (confirm("' . get_lang('AreYouSureToDeleteJS').'", filename)) {
             $.ajax({
                 type: "POST",
-                url: "'.api_get_path(WEB_AJAX_PATH) . 'forum.ajax.php?'.api_get_cidreq().'&a=delete_file&attachId=" + id +"&thread='.$threadId .'&forum='.$forumId .'",
+                url: "'.api_get_path(WEB_AJAX_PATH).'forum.ajax.php?'.api_get_cidreq().'&a=delete_file&attachId=" + id +"&thread='.$threadId.'&forum='.$forumId.'",
                 dataType: "json",
                 success: function(data) {
                     if (data.error == false) {
@@ -180,7 +180,7 @@ 
 function show_add_forumcategory_form($inputvalues = array(), $lp_id)
 {
     // Initialize the object.
-    $form = new FormValidator('forumcategory', 'post', 'index.php?' . api_get_cidreq());
+    $form = new FormValidator('forumcategory', 'post', 'index.php?'.api_get_cidreq());
     // hidden field if from learning path
 
     $form->addElement('hidden', 'lp_id', $lp_id);
@@ -230,7 +230,7 @@ 
 function show_add_forum_form($inputvalues = array(), $lp_id)
 {
     $_course = api_get_course_info();
-    $form = new FormValidator('forumcategory', 'post', 'index.php?' . api_get_cidreq());
+    $form = new FormValidator('forumcategory', 'post', 'index.php?'.api_get_cidreq());
 
     // The header for the form
     if (!empty($inputvalues)) {
@@ -347,9 +347,9 @@ 
     // Forum image
     $form->addProgress();
     if (!empty($inputvalues['forum_image'])) {
-        $baseImagePath = api_get_course_path() . '/upload/forum/images/' . $inputvalues['forum_image'];
-        $image_path = api_get_path(WEB_COURSE_PATH) . $baseImagePath;
-        $sysImagePath = api_get_path(SYS_COURSE_PATH) . $baseImagePath;
+        $baseImagePath = api_get_course_path().'/upload/forum/images/'.$inputvalues['forum_image'];
+        $image_path = api_get_path(WEB_COURSE_PATH).$baseImagePath;
+        $sysImagePath = api_get_path(SYS_COURSE_PATH).$baseImagePath;
 
         if (file_exists($sysImagePath)) {
             $show_preview_image = Display::img($image_path, null, ['class' => 'img-responsive']);
@@ -1007,24 +1007,24 @@ 
     $html = '';
     $id = Security::remove_XSS($id);
     if ($current_visibility_status == '1') {
-        $html .= '<a href="' . api_get_self() . '?' . api_get_cidreq() . '&';
+        $html .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&';
         if (is_array($additional_url_parameters)) {
             foreach ($additional_url_parameters as $key => $value) {
-                $html .= $key . '=' . $value . '&';
+                $html .= $key.'='.$value.'&';
             }
         }
-        $html.='action=invisible&content='.$content.'&id='.$id.'">'.
+        $html .= 'action=invisible&content='.$content.'&id='.$id.'">'.
             Display::return_icon('visible.png', get_lang('MakeInvisible'), array(), ICON_SIZE_SMALL).'</a>';
     }
     if ($current_visibility_status == '0') {
-        $html .= '<a href="' . api_get_self() . '?' . api_get_cidreq() . '&';
+        $html .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&';
         if (is_array($additional_url_parameters)) {
             foreach ($additional_url_parameters as $key => $value) {
-                $html .= $key . '=' . $value . '&';
+                $html .= $key.'='.$value.'&';
             }
         }
-        $html .= 'action=visible&content=' . $content . '&id=' . $id . '">' .
-            Display::return_icon('invisible.png', get_lang('MakeVisible'), array(), ICON_SIZE_SMALL) . '</a>';
+        $html .= 'action=visible&content='.$content.'&id='.$id.'">'.
+            Display::return_icon('invisible.png', get_lang('MakeVisible'), array(), ICON_SIZE_SMALL).'</a>';
     }
     return $html;
 }
@@ -1052,21 +1052,21 @@ 
         $html .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&';
         if (is_array($additional_url_parameters)) {
             foreach ($additional_url_parameters as $key => $value) {
-                $html .= $key . '=' . $value . '&';
+                $html .= $key.'='.$value.'&';
             }
         }
-        $html.= 'action=unlock&content='.$content.'&id='.$id.'">'.
+        $html .= 'action=unlock&content='.$content.'&id='.$id.'">'.
             Display::return_icon('lock.png', get_lang('Unlock'), array(), ICON_SIZE_SMALL).'</a>';
     }
     if ($current_lock_status == '0') {
         $html .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&';
         if (is_array($additional_url_parameters)) {
             foreach ($additional_url_parameters as $key => $value) {
-                $html .= $key . '=' . $value . '&';
+                $html .= $key.'='.$value.'&';
             }
         }
-        $html .= 'action=lock&content=' . $content . '&id=' . $id . '">' .
-            Display::return_icon('unlock.png', get_lang('Lock'), array(), ICON_SIZE_SMALL) . '</a>';
+        $html .= 'action=lock&content='.$content.'&id='.$id.'">'.
+            Display::return_icon('unlock.png', get_lang('Lock'), array(), ICON_SIZE_SMALL).'</a>';
     }
     return $html;
 }
@@ -1244,7 +1244,7 @@ 
         $sort_column = 'forum_order';
         // We also need the forum_category of this forum.
         $sql = "SELECT forum_category FROM $table_forums
-                WHERE c_id = $course_id AND forum_id = " . intval($id);
+                WHERE c_id = $course_id AND forum_id = ".intval($id);
         $result = Database::query($sql);
         $row = Database::fetch_array($result);
         $forum_category = $row['forum_category'];
@@ -1269,7 +1269,7 @@ 
                     forum_categories.c_id = $course_id AND
                     item_properties.c_id = $course_id AND
                     forum_categories.cat_id=item_properties.ref AND
-                    item_properties.tool='" . TOOL_FORUM_CATEGORY . "'
+                    item_properties.tool='".TOOL_FORUM_CATEGORY."'
                 ORDER BY forum_categories.cat_order $sort_direction";
     }
     if ($content == 'forum') {
@@ -1277,7 +1277,7 @@ 
             FROM $table
             WHERE
                 c_id = $course_id AND
-                forum_category='" . Database::escape_string($forum_category) . "'
+                forum_category='".Database::escape_string($forum_category)."'
             ORDER BY forum_order $sort_direction";
     }
     // Finding the items that need to be switched.
@@ -1301,16 +1301,16 @@ 
     // We do an extra check if we do not have illegal values. If your remove this if statment you will
     // be able to mess with the sorting by refreshing the page over and over again.
     if ($this_sort != '' && $next_sort != '' && $next_id != '' && $this_id != '') {
-        $sql = "UPDATE $table SET $sort_column='" . Database::escape_string($this_sort) . "'
-                WHERE c_id = $course_id AND $id_column='" . Database::escape_string($next_id) . "'";
+        $sql = "UPDATE $table SET $sort_column='".Database::escape_string($this_sort)."'
+                WHERE c_id = $course_id AND $id_column='".Database::escape_string($next_id)."'";
         Database::query($sql);
 
-        $sql = "UPDATE $table SET $sort_column='" . Database::escape_string($next_sort) . "'
-                WHERE c_id = $course_id AND $id_column='" . Database::escape_string($this_id) . "'";
+        $sql = "UPDATE $table SET $sort_column='".Database::escape_string($next_sort)."'
+                WHERE c_id = $course_id AND $id_column='".Database::escape_string($this_id)."'";
         Database::query($sql);
     }
 
-    return get_lang(ucfirst($content) . 'Moved');
+    return get_lang(ucfirst($content).'Moved');
 }
 
 /**
@@ -1572,7 +1572,7 @@ 
                 INNER JOIN $table_forums forum
                 ON (forum.forum_id = item_properties.ref AND forum.c_id = item_properties.c_id)
                 WHERE
-                    forum.forum_id = " . intval($id) . " AND
+                    forum.forum_id = ".intval($id)." AND
                     forum.c_id = $course_id AND
                     item_properties.visibility != 2 AND
                     item_properties.tool = '".TOOL_FORUM."'
@@ -1582,7 +1582,7 @@ 
         $sql2 = "SELECT count(*) AS number_of_threads, forum_id
                 FROM $table_threads
                 WHERE
-                    forum_id = " . intval($id) . "
+                    forum_id = ".intval($id)."
                 GROUP BY forum_id";
     }
 
@@ -1810,7 +1810,7 @@ 
     $groupCondition = '';
     if (!empty($groupInfo)) {
         $groupIid = $groupInfo['iid'];
-        $groupCondition =  " AND item_properties.to_group_id = '$groupIid' ";
+        $groupCondition = " AND item_properties.to_group_id = '$groupIid' ";
     }
 
     $sessionCondition = api_get_session_condition($sessionId, true, false, 'item_properties.session_id');
@@ -2301,7 +2301,7 @@ 
 {
     $table_forums = Database :: get_course_table(TABLE_FORUM);
     $table_item_property = Database :: get_course_table(TABLE_ITEM_PROPERTY);
-    $courseId = empty($courseId) ? api_get_course_int_id(): intval($courseId);
+    $courseId = empty($courseId) ? api_get_course_int_id() : intval($courseId);
     $forum_id = intval($forum_id);
 
     $sql = "SELECT *
@@ -2742,11 +2742,11 @@ 
     $form = new FormValidator(
         'thread',
         'post',
-        api_get_self() . '?' . http_build_query([
+        api_get_self().'?'.http_build_query([
             'forum' => $myForum,
             'gradebook' => $myGradebook,
             'thread' => $myThread,
-        ]) . '&' . api_get_cidreq()
+        ]).'&'.api_get_cidreq()
     );
 
     $form->addElement('header', get_lang('EditThread'));
@@ -2809,7 +2809,7 @@ 
     $form->addElement('html', '</div>');
 
     if (!empty($formValues)) {
-        $defaults['thread_qualify_gradebook'] = ($formValues['threadQualifyMax'] > 0 && empty($_POST)) ? 1 : 0 ;
+        $defaults['thread_qualify_gradebook'] = ($formValues['threadQualifyMax'] > 0 && empty($_POST)) ? 1 : 0;
         $defaults['thread_title'] = prepare4display($formValues['threadTitle']);
         $defaults['thread_sticky'] = strval(intval($formValues['threadSticky']));
         $defaults['thread_peer_qualify'] = intval($formValues['threadPeerQualify']);
@@ -2877,13 +2877,13 @@ 
     $my_post = isset($_GET['post']) ? (int) $_GET['post'] : '';
     $my_gradebook = isset($_GET['gradebook']) ? Security::remove_XSS($_GET['gradebook']) : '';
 
-    $url = api_get_self() . '?' . http_build_query([
+    $url = api_get_self().'?'.http_build_query([
         'action' => $action,
         'forum' => $forumId,
         'gradebook' => $my_gradebook,
         'thread' => $myThread,
         'post' => $my_post
-    ]) . '&' . api_get_cidreq();
+    ]).'&'.api_get_cidreq();
 
     $form = new FormValidator(
         'thread',
@@ -3180,7 +3180,7 @@ 
 
             if ($row[0] == 0) {
                 $sql = "INSERT INTO $table_threads_qualify (c_id, user_id, thread_id,qualify,qualify_user_id,qualify_time,session_id)
-                        VALUES (".$course_id.", '".$user_id."','".$thread_id."',".(float)$thread_qualify.", '".$currentUserId."','".$qualify_time."','".$session_id."')";
+                        VALUES (".$course_id.", '".$user_id."','".$thread_id."',".(float) $thread_qualify.", '".$currentUserId."','".$qualify_time."','".$session_id."')";
                 Database::query($sql);
 
                 $insertId = Database::insert_id();
@@ -4772,9 +4772,9 @@ 
             continue;
         }
 
-        $course_dir = $_course['path'] . '/upload/forum';
+        $course_dir = $_course['path'].'/upload/forum';
         $sys_course_path = api_get_path(SYS_COURSE_PATH);
-        $updir = $sys_course_path . $course_dir;
+        $updir = $sys_course_path.$course_dir;
 
         // Try to add an extension to the file if it hasn't one.
         $new_file_name = add_ext_on_mime(
@@ -4791,7 +4791,7 @@ 
         }
 
         $new_file_name = uniqid('');
-        $new_path = $updir . '/' . $new_file_name;
+        $new_path = $updir.'/'.$new_file_name;
         $result = @move_uploaded_file($attachment['tmp_name'], $new_path);
         $safe_file_comment = Database::escape_string($file_comment);
         $safe_file_name = Database::escape_string($file_name);
@@ -4957,16 +4957,16 @@ 
     $forum_table_attachment = Database::get_course_table(TABLE_FORUM_ATTACHMENT);
     $course_id = api_get_course_int_id();
 
-    $cond = (!empty($id_attach)) ? " iid = " . (int) $id_attach . "" : " post_id = " . (int) $post_id . "";
+    $cond = (!empty($id_attach)) ? " iid = ".(int) $id_attach."" : " post_id = ".(int) $post_id."";
     $sql = "SELECT path FROM $forum_table_attachment WHERE c_id = $course_id AND $cond";
     $res = Database::query($sql);
     $row = Database::fetch_array($res);
 
-    $course_dir = $_course['path'] . '/upload/forum';
+    $course_dir = $_course['path'].'/upload/forum';
     $sys_course_path = api_get_path(SYS_COURSE_PATH);
-    $updir = $sys_course_path . $course_dir;
+    $updir = $sys_course_path.$course_dir;
     $my_path = isset($row['path']) ? $row['path'] : null;
-    $file = $updir . '/' . $my_path;
+    $file = $updir.'/'.$my_path;
     if (Security::check_abs_path($file, $updir)) {
         @unlink($file);
     }
@@ -5520,37 +5520,37 @@ 
                         $post_list = get_thread_user_post_limit($course_code, $thread['thread_id'], $user_id, 1);
                         $post_counter = count($post_list);
                         if (is_array($post_list) && count($post_list) > 0) {
-                            $hand_forums.= '<div id="social-thread">';
-                            $hand_forums.= Display::return_icon('thread.png', get_lang('Thread'), '', ICON_SIZE_MEDIUM);
-                            $hand_forums.= '&nbsp;'.Security::remove_XSS($thread['thread_title'], STUDENT);
-                            $hand_forums.= '</div>';
+                            $hand_forums .= '<div id="social-thread">';
+                            $hand_forums .= Display::return_icon('thread.png', get_lang('Thread'), '', ICON_SIZE_MEDIUM);
+                            $hand_forums .= '&nbsp;'.Security::remove_XSS($thread['thread_title'], STUDENT);
+                            $hand_forums .= '</div>';
 
                             foreach ($post_list as $posts) {
-                                $hand_forums.= '<div id="social-post">';
-                                $hand_forums.= '<strong>'.Security::remove_XSS($posts['post_title'], STUDENT).'</strong>';
-                                $hand_forums.= '<br / >';
-                                $hand_forums.= Security::remove_XSS($posts['post_text'], STUDENT);
-                                $hand_forums.= '</div>';
-                                $hand_forums.= '<br / >';
+                                $hand_forums .= '<div id="social-post">';
+                                $hand_forums .= '<strong>'.Security::remove_XSS($posts['post_title'], STUDENT).'</strong>';
+                                $hand_forums .= '<br / >';
+                                $hand_forums .= Security::remove_XSS($posts['post_text'], STUDENT);
+                                $hand_forums .= '</div>';
+                                $hand_forums .= '<br / >';
                             }
                         }
                     }
                     $i++;
                 }
-                $forum_results .='<div id="social-forum">';
-                $forum_results .='<div class="clear"></div><br />';
-                $forum_results .='<div id="social-forum-title">'.
+                $forum_results .= '<div id="social-forum">';
+                $forum_results .= '<div class="clear"></div><br />';
+                $forum_results .= '<div id="social-forum-title">'.
                     Display::return_icon('forum.gif', get_lang('Forum')).'&nbsp;'.Security::remove_XSS($forum['forum_title'], STUDENT).
                     '<div style="float:right;margin-top:-35px">
                         <a href="../forum/viewforum.php?'.api_get_cidreq_params($course_code).'&forum='.$forum['forum_id'].' " >'.
                             get_lang('SeeForum').'    
                         </a>
                      </div></div>';
-                $forum_results .='<br / >';
+                $forum_results .= '<br / >';
                 if ($post_counter > 0) {
-                    $forum_results .=$hand_forums;
+                    $forum_results .= $hand_forums;
                 }
-                $forum_results .='</div>';
+                $forum_results .= '</div>';
             }$j++;
         }
     }
@@ -5691,16 +5691,16 @@ 
     $courseId = intval($courseId);
     if (empty($courseId)) {
         // $courseId can be null, use api method
-        $courseId= api_get_course_int_id();
+        $courseId = api_get_course_int_id();
     }
     /*
      * Check if Attachment ID and Course ID are greater than zero
      * and array of field values is not empty
      */
     if ($id > 0 && $courseId > 0 && !empty($array) && is_array($array)) {
-        foreach($array as $key => &$item) {
+        foreach ($array as $key => &$item) {
             $item = Database::escape_string($item);
-            $setString .= $key . ' = "' .$item . '", ';
+            $setString .= $key.' = "'.$item.'", ';
         }
         // Delete last comma
         $setString = substr($setString, 0, strlen($setString) - 2);
@@ -5760,10 +5760,10 @@ 
         foreach ($uploadedFiles as $k => $uploadedFile) {
             if (!empty($uploadedFile) && in_array($uploadedFile['id'], $attachIds)) {
                 // Buil html table including an input with attachmentID
-                $fileDataContent .= '<tr id="' . $uploadedFile['id'] . '" ><td>' . $uploadedFile['name'] . '</td><td>' . $uploadedFile['size'] . '</td><td>&nbsp;' . $uploadedFile['result'] .
-                    ' </td><td> <input style="width:90%;" type="text" value="' . $uploadedFile['comment'] . '" name="file_comments[]"> </td><td>' .
-                    $uploadedFile['delete'] . '</td>' .
-                    '<input type="hidden" value="' . $uploadedFile['id'] .'" name="file_ids[]">' . '</tr>';
+                $fileDataContent .= '<tr id="'.$uploadedFile['id'].'" ><td>'.$uploadedFile['name'].'</td><td>'.$uploadedFile['size'].'</td><td>&nbsp;'.$uploadedFile['result'].
+                    ' </td><td> <input style="width:90%;" type="text" value="'.$uploadedFile['comment'].'" name="file_comments[]"> </td><td>'.
+                    $uploadedFile['delete'].'</td>'.
+                    '<input type="hidden" value="'.$uploadedFile['id'].'" name="file_ids[]">'.'</tr>';
             } else {
                 /*
                  * If attachment data is empty, then delete it from $_SESSION
@@ -5776,7 +5776,7 @@ 
     $style = empty($fileDataContent) ? 'display: none;' : '';
     // Forum attachment Ajax table
     $fileData = '
-    <div class="control-group " style="'. $style . '">
+    <div class="control-group " style="'. $style.'">
         <label class="control-label">'.get_lang('AttachmentList').'</label>
         <div class="controls">
             <table id="attachmentFileList" class="files data_table span10">
@@ -5848,7 +5848,7 @@ 
             // name contains an URL to download attachment file and its filename
             $json['name'] = Display::url(
                 api_htmlentities($row['filename']),
-                api_get_path(WEB_CODE_PATH) . 'forum/download.php?file='.$row['path'].'&'.api_get_cidreq(),
+                api_get_path(WEB_CODE_PATH).'forum/download.php?file='.$row['path'].'&'.api_get_cidreq(),
                 array('target'=>'_blank', 'class' => 'attachFilename')
             );
             $json['id'] = $row['iid'];
@@ -5859,9 +5859,9 @@ 
             if (!empty($row) && is_array($row)) {
                 // Set result as success and bring delete URL
                 $json['result'] = Display::return_icon('accept.png', get_lang('Uploaded'));
-                $url = api_get_path(WEB_CODE_PATH) . 'forum/viewthread.php?' . api_get_cidreq() . '&action=delete_attach&forum=' . $forumId . '&thread=' . $threadId.'&id_attach=' . $row['iid'];
+                $url = api_get_path(WEB_CODE_PATH).'forum/viewthread.php?'.api_get_cidreq().'&action=delete_attach&forum='.$forumId.'&thread='.$threadId.'&id_attach='.$row['iid'];
                 $json['delete'] = Display::url(
-                    Display::return_icon('delete.png',get_lang('Delete'), array(), ICON_SIZE_SMALL),
+                    Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL),
                     $url,
                     array('class' => 'deleteLink')
                 );
@@ -5950,7 +5950,7 @@ 
                 WHERE c_id = $courseId AND post_id = $postId";
         $result = Database::query($sql);
         if ($result !== false && Database::num_rows($result) > 0) {
-            while ($row = Database::fetch_array($result,'ASSOC')) {
+            while ($row = Database::fetch_array($result, 'ASSOC')) {
                 $array[] = $row['id'];
             }
         }

custompages/language.inc.php

Indentation +5 added lines, -5 removed lines

@@ -29,11 +29,11 @@
     krsort($langs, SORT_NUMERIC);
     // Choosing the best match
     foreach($langs as $weight => $codes) {
-		foreach ($codes as $code) {
-        	if (in_array($code, $available_langs)) {
-            	return $code;
-        	}
-		}
+        foreach ($codes as $code) {
+            if (in_array($code, $available_langs)) {
+                return $code;
+            }
+        }
     }
     // No match
     return null;

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
     }
     krsort($langs, SORT_NUMERIC);
     // Choosing the best match
-    foreach($langs as $weight => $codes) {
+    foreach ($langs as $weight => $codes) {
 		foreach ($codes as $code) {
         	if (in_array($code, $available_langs)) {
             	return $code;

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

Doc Comments +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
 	* @param    string $encoding character encoding scheme of message

 	* @param    string $method method for which XML is parsed (unused?)

 	* @param    bool $decode_utf8 whether to decode UTF-8 to ISO-8859-1

-	* @return void|bool

+	* @return false|null

 	* @access   public

 	*/

 	function nusoap_parser($xml,$encoding='UTF-8',$method='',$decode_utf8=true){

Indentation +546 added lines, -546 removed lines

@@ -11,236 +11,236 @@ 
 */

 class nusoap_parser extends nusoap_base

 {

-	var $xml = '';

-	var $xml_encoding = '';

-	var $method = '';

-	var $root_struct = '';

-	var $root_struct_name = '';

-	var $root_struct_namespace = '';

-	var $root_header = '';

+    var $xml = '';

+    var $xml_encoding = '';

+    var $method = '';

+    var $root_struct = '';

+    var $root_struct_name = '';

+    var $root_struct_namespace = '';

+    var $root_header = '';

     var $document = '';			// incoming SOAP body (text)

-	// determines where in the message we are (envelope,header,body,method)

-	var $status = '';

-	var $position = 0;

-	var $depth = 0;

-	var $default_namespace = '';

-	var $namespaces = array();

-	var $message = array();

+    // determines where in the message we are (envelope,header,body,method)

+    var $status = '';

+    var $position = 0;

+    var $depth = 0;

+    var $default_namespace = '';

+    var $namespaces = array();

+    var $message = array();

     var $parent;

-	var $fault = false;

-	var $fault_code = '';

-	var $fault_str = '';

-	var $fault_detail = '';

-	var $depth_array = array();

-	var $debug_flag = true;

-	var $soapresponse = NULL;	// parsed SOAP Body

-	var $soapheader = NULL;		// parsed SOAP Header

-	var $responseHeaders = '';	// incoming SOAP headers (text)

-	var $body_position = 0;

-	// for multiref parsing:

-	// array of id => pos

-	var $ids = array();

-	// array of id => hrefs => pos

-	var $multirefs = array();

-	// toggle for auto-decoding element content

-	var $decode_utf8 = true;

+    var $fault = false;

+    var $fault_code = '';

+    var $fault_str = '';

+    var $fault_detail = '';

+    var $depth_array = array();

+    var $debug_flag = true;

+    var $soapresponse = NULL;	// parsed SOAP Body

+    var $soapheader = NULL;		// parsed SOAP Header

+    var $responseHeaders = '';	// incoming SOAP headers (text)

+    var $body_position = 0;

+    // for multiref parsing:

+    // array of id => pos

+    var $ids = array();

+    // array of id => hrefs => pos

+    var $multirefs = array();

+    // toggle for auto-decoding element content

+    var $decode_utf8 = true;

 

-	/**

-	* constructor that actually does the parsing

-	*

-	* @param    string $xml SOAP message

-	* @param    string $encoding character encoding scheme of message

-	* @param    string $method method for which XML is parsed (unused?)

-	* @param    bool $decode_utf8 whether to decode UTF-8 to ISO-8859-1

-	* @return void|bool

-	* @access   public

-	*/

-	function __construct($xml,$encoding='UTF-8',$method='',$decode_utf8=true)

+    /**

+     * constructor that actually does the parsing

+     *

+     * @param    string $xml SOAP message

+     * @param    string $encoding character encoding scheme of message

+     * @param    string $method method for which XML is parsed (unused?)

+     * @param    bool $decode_utf8 whether to decode UTF-8 to ISO-8859-1

+     * @return void|bool

+     * @access   public

+     */

+    function __construct($xml,$encoding='UTF-8',$method='',$decode_utf8=true)

     {

-		parent::__construct();

-		$this->xml = $xml;

-		$this->xml_encoding = $encoding;

-		$this->method = $method;

-		$this->decode_utf8 = $decode_utf8;

+        parent::__construct();

+        $this->xml = $xml;

+        $this->xml_encoding = $encoding;

+        $this->method = $method;

+        $this->decode_utf8 = $decode_utf8;

 

-		// Check whether content has been read.

-		if(!empty($this->xml)){

-			// Check XML encoding

-			$pos_xml = strpos($xml, '<?xml');

-			if ($pos_xml !== FALSE) {

-				$xml_decl = substr($xml, $pos_xml, strpos($xml, '?>', $pos_xml + 2) - $pos_xml + 1);

-				if (preg_match("/encoding=[\"']([^\"']*)[\"']/", $xml_decl, $res)) {

-					$xml_encoding = $res[1];

-					if (strtoupper($xml_encoding) != $encoding) {

-						$err = "Charset from HTTP Content-Type '" . $encoding . "' does not match encoding from XML declaration '" . $xml_encoding . "'";

-						$this->debug($err);

-						if ($encoding != 'ISO-8859-1' || strtoupper($xml_encoding) != 'UTF-8') {

-							$this->setError($err);

-							return false;

-						}

-						// when HTTP says ISO-8859-1 (the default) and XML says UTF-8 (the typical), assume the other endpoint is just sloppy and proceed

-					} else {

-						$this->debug('Charset from HTTP Content-Type matches encoding from XML declaration');

-					}

-				} else {

-					$this->debug('No encoding specified in XML declaration');

-				}

-			} else {

-				$this->debug('No XML declaration');

-			}

-			$this->debug('Entering nusoap_parser(), length='.strlen($xml).', encoding='.$encoding);

-			// Create an XML parser - why not xml_parser_create_ns?

-			$this->parser = xml_parser_create($this->xml_encoding);

-			// Set the options for parsing the XML data.

-			//xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 1);

-			xml_parser_set_option($this->parser, XML_OPTION_CASE_FOLDING, 0);

-			xml_parser_set_option($this->parser, XML_OPTION_TARGET_ENCODING, $this->xml_encoding);

-			// Set the object for the parser.

-			xml_set_object($this->parser, $this);

-			// Set the element handlers for the parser.

-			xml_set_element_handler($this->parser, 'start_element','end_element');

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

+        // Check whether content has been read.

+        if(!empty($this->xml)){

+            // Check XML encoding

+            $pos_xml = strpos($xml, '<?xml');

+            if ($pos_xml !== FALSE) {

+                $xml_decl = substr($xml, $pos_xml, strpos($xml, '?>', $pos_xml + 2) - $pos_xml + 1);

+                if (preg_match("/encoding=[\"']([^\"']*)[\"']/", $xml_decl, $res)) {

+                    $xml_encoding = $res[1];

+                    if (strtoupper($xml_encoding) != $encoding) {

+                        $err = "Charset from HTTP Content-Type '" . $encoding . "' does not match encoding from XML declaration '" . $xml_encoding . "'";

+                        $this->debug($err);

+                        if ($encoding != 'ISO-8859-1' || strtoupper($xml_encoding) != 'UTF-8') {

+                            $this->setError($err);

+                            return false;

+                        }

+                        // when HTTP says ISO-8859-1 (the default) and XML says UTF-8 (the typical), assume the other endpoint is just sloppy and proceed

+                    } else {

+                        $this->debug('Charset from HTTP Content-Type matches encoding from XML declaration');

+                    }

+                } else {

+                    $this->debug('No encoding specified in XML declaration');

+                }

+            } else {

+                $this->debug('No XML declaration');

+            }

+            $this->debug('Entering nusoap_parser(), length='.strlen($xml).', encoding='.$encoding);

+            // Create an XML parser - why not xml_parser_create_ns?

+            $this->parser = xml_parser_create($this->xml_encoding);

+            // Set the options for parsing the XML data.

+            //xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 1);

+            xml_parser_set_option($this->parser, XML_OPTION_CASE_FOLDING, 0);

+            xml_parser_set_option($this->parser, XML_OPTION_TARGET_ENCODING, $this->xml_encoding);

+            // Set the object for the parser.

+            xml_set_object($this->parser, $this);

+            // Set the element handlers for the parser.

+            xml_set_element_handler($this->parser, 'start_element','end_element');

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

 

-			xml_parse($this->parser, $this->xml);

+            xml_parse($this->parser, $this->xml);

 

-			// Parse the XML file.

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

-			if (false) {

-			    // Display an error message.

-			    $err = sprintf('XML error parsing SOAP payload on line %d: %s',

-			    xml_get_current_line_number($this->parser),

-			    xml_error_string(xml_get_error_code($this->parser)));

-				$this->debug($err);

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

-				$this->setError($err);

-			} else {

-				$this->debug('in nusoap_parser ctor, message:');

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

-				$this->debug('parsed successfully, found root struct: '.$this->root_struct.' of name '.$this->root_struct_name);

-				// get final value

-				$this->soapresponse = $this->message[$this->root_struct]['result'];

-				// get header value

-				if($this->root_header != '' && isset($this->message[$this->root_header]['result'])){

-					$this->soapheader = $this->message[$this->root_header]['result'];

-				}

-				// resolve hrefs/ids

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

-					foreach($this->multirefs as $id => $hrefs){

-						$this->debug('resolving multirefs for id: '.$id);

-						$idVal = $this->buildVal($this->ids[$id]);

-						if (is_array($idVal) && isset($idVal['!id'])) {

-							unset($idVal['!id']);

-						}

-						foreach($hrefs as $refPos => $ref){

-							$this->debug('resolving href at pos '.$refPos);

-							$this->multirefs[$id][$refPos] = $idVal;

-						}

-					}

-				}

-			}

-			xml_parser_free($this->parser);

-		} else {

-			$this->debug('xml was empty, didn\'t parse!');

-			$this->setError('xml was empty, didn\'t parse!');

-		}

-	}

+            // Parse the XML file.

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

+            if (false) {

+                // Display an error message.

+                $err = sprintf('XML error parsing SOAP payload on line %d: %s',

+                xml_get_current_line_number($this->parser),

+                xml_error_string(xml_get_error_code($this->parser)));

+                $this->debug($err);

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

+                $this->setError($err);

+            } else {

+                $this->debug('in nusoap_parser ctor, message:');

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

+                $this->debug('parsed successfully, found root struct: '.$this->root_struct.' of name '.$this->root_struct_name);

+                // get final value

+                $this->soapresponse = $this->message[$this->root_struct]['result'];

+                // get header value

+                if($this->root_header != '' && isset($this->message[$this->root_header]['result'])){

+                    $this->soapheader = $this->message[$this->root_header]['result'];

+                }

+                // resolve hrefs/ids

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

+                    foreach($this->multirefs as $id => $hrefs){

+                        $this->debug('resolving multirefs for id: '.$id);

+                        $idVal = $this->buildVal($this->ids[$id]);

+                        if (is_array($idVal) && isset($idVal['!id'])) {

+                            unset($idVal['!id']);

+                        }

+                        foreach($hrefs as $refPos => $ref){

+                            $this->debug('resolving href at pos '.$refPos);

+                            $this->multirefs[$id][$refPos] = $idVal;

+                        }

+                    }

+                }

+            }

+            xml_parser_free($this->parser);

+        } else {

+            $this->debug('xml was empty, didn\'t parse!');

+            $this->setError('xml was empty, didn\'t parse!');

+        }

+    }

 

-	/**

-	* start-element handler

-	*

-	* @param    resource $parser XML parser object

-	* @param    string $name element name

-	* @param    array $attrs associative array of attributes

-	* @access   private

-	*/

-	function start_element($parser, $name, $attrs) {

+    /**

+     * start-element handler

+     *

+     * @param    resource $parser XML parser object

+     * @param    string $name element name

+     * @param    array $attrs associative array of attributes

+     * @access   private

+     */

+    function start_element($parser, $name, $attrs) {

 

-		// position in a total number of elements, starting from 0

-		// update class level pos

-		$pos = $this->position++;

-		// and set mine

-		$this->message[$pos] = array('pos' => $pos,'children'=>'','cdata'=>'');

-		// depth = how many levels removed from root?

-		// set mine as current global depth and increment global depth value

-		$this->message[$pos]['depth'] = $this->depth++;

+        // position in a total number of elements, starting from 0

+        // update class level pos

+        $pos = $this->position++;

+        // and set mine

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

+        // depth = how many levels removed from root?

+        // set mine as current global depth and increment global depth value

+        $this->message[$pos]['depth'] = $this->depth++;

 

-		// else add self as child to whoever the current parent is

-		if($pos != 0){

-			$this->message[$this->parent]['children'] .= '|'.$pos;

-		}

-		// set my parent

-		$this->message[$pos]['parent'] = $this->parent;

-		// set self as current parent

-		$this->parent = $pos;

-		// set self as current value for this depth

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

-		// get element prefix

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

-			// get ns prefix

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

-			// get unqualified name

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

-		}

-		// set status

-		if ($name == 'Envelope' && $this->status == '') {

-			$this->status = 'envelope';

-		} elseif ($name == 'Header' && $this->status == 'envelope') {

-			$this->root_header = $pos;

-			$this->status = 'header';

-		} elseif ($name == 'Body' && $this->status == 'envelope'){

-			$this->status = 'body';

-			$this->body_position = $pos;

-		// set method

-		} elseif($this->status == 'body' && $pos == ($this->body_position+1)) {

-			$this->status = 'method';

-			$this->root_struct_name = $name;

-			$this->root_struct = $pos;

-			$this->message[$pos]['type'] = 'struct';

-			$this->debug("found root struct $this->root_struct_name, pos $this->root_struct");

-		}

-		// set my status

-		$this->message[$pos]['status'] = $this->status;

-		// set name

-		$this->message[$pos]['name'] = htmlspecialchars($name);

-		// set attrs

-		$this->message[$pos]['attrs'] = $attrs;

+        // else add self as child to whoever the current parent is

+        if($pos != 0){

+            $this->message[$this->parent]['children'] .= '|'.$pos;

+        }

+        // set my parent

+        $this->message[$pos]['parent'] = $this->parent;

+        // set self as current parent

+        $this->parent = $pos;

+        // set self as current value for this depth

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

+        // get element prefix

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

+            // get ns prefix

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

+            // get unqualified name

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

+        }

+        // set status

+        if ($name == 'Envelope' && $this->status == '') {

+            $this->status = 'envelope';

+        } elseif ($name == 'Header' && $this->status == 'envelope') {

+            $this->root_header = $pos;

+            $this->status = 'header';

+        } elseif ($name == 'Body' && $this->status == 'envelope'){

+            $this->status = 'body';

+            $this->body_position = $pos;

+        // set method

+        } elseif($this->status == 'body' && $pos == ($this->body_position+1)) {

+            $this->status = 'method';

+            $this->root_struct_name = $name;

+            $this->root_struct = $pos;

+            $this->message[$pos]['type'] = 'struct';

+            $this->debug("found root struct $this->root_struct_name, pos $this->root_struct");

+        }

+        // set my status

+        $this->message[$pos]['status'] = $this->status;

+        // set name

+        $this->message[$pos]['name'] = htmlspecialchars($name);

+        // set attrs

+        $this->message[$pos]['attrs'] = $attrs;

 

-		// loop through atts, logging ns and type declarations

+        // loop through atts, logging ns and type declarations

         $attstr = '';

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

-        	$key_prefix = $this->getPrefix($key);

-			$key_localpart = $this->getLocalPart($key);

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

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

+            $key_prefix = $this->getPrefix($key);

+            $key_localpart = $this->getLocalPart($key);

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

             if($key_prefix == 'xmlns'){

-				if(preg_match('/^http:\/\/www.w3.org\/[0-9]{4}\/XMLSchema$/',$value)){

-					$this->XMLSchemaVersion = $value;

-					$this->namespaces['xsd'] = $this->XMLSchemaVersion;

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

-				}

+                if(preg_match('/^http:\/\/www.w3.org\/[0-9]{4}\/XMLSchema$/',$value)){

+                    $this->XMLSchemaVersion = $value;

+                    $this->namespaces['xsd'] = $this->XMLSchemaVersion;

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

+                }

                 $this->namespaces[$key_localpart] = $value;

-				// set method namespace

-				if($name == $this->root_struct_name){

-					$this->methodNamespace = $value;

-				}

-			// if it's a type declaration, set type

+                // set method namespace

+                if($name == $this->root_struct_name){

+                    $this->methodNamespace = $value;

+                }

+            // if it's a type declaration, set type

         } elseif($key_localpart == 'type'){

-        		if (isset($this->message[$pos]['type']) && $this->message[$pos]['type'] == 'array') {

-        			// do nothing: already processed arrayType

-        		} else {

-	            	$value_prefix = $this->getPrefix($value);

-	                $value_localpart = $this->getLocalPart($value);

-					$this->message[$pos]['type'] = $value_localpart;

-					$this->message[$pos]['typePrefix'] = $value_prefix;

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

-	                	$this->message[$pos]['type_namespace'] = $this->namespaces[$value_prefix];

-	                } else if(isset($attrs['xmlns:'.$value_prefix])) {

-						$this->message[$pos]['type_namespace'] = $attrs['xmlns:'.$value_prefix];

-	                }

-					// should do something here with the namespace of specified type?

-				}

-			} elseif($key_localpart == 'arrayType'){

-				$this->message[$pos]['type'] = 'array';

-				/* do arrayType ereg here

+                if (isset($this->message[$pos]['type']) && $this->message[$pos]['type'] == 'array') {

+                    // do nothing: already processed arrayType

+                } else {

+                    $value_prefix = $this->getPrefix($value);

+                    $value_localpart = $this->getLocalPart($value);

+                    $this->message[$pos]['type'] = $value_localpart;

+                    $this->message[$pos]['typePrefix'] = $value_prefix;

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

+                        $this->message[$pos]['type_namespace'] = $this->namespaces[$value_prefix];

+                    } else if(isset($attrs['xmlns:'.$value_prefix])) {

+                        $this->message[$pos]['type_namespace'] = $attrs['xmlns:'.$value_prefix];

+                    }

+                    // should do something here with the namespace of specified type?

+                }

+            } elseif($key_localpart == 'arrayType'){

+                $this->message[$pos]['type'] = 'array';

+                /* do arrayType ereg here

 				[1]    arrayTypeValue    ::=    atype asize

 				[2]    atype    ::=    QName rank*

 				[3]    rank    ::=    '[' (',')* ']'

@@ -248,129 +248,129 @@ 
 				[5]    length    ::=    nextDimension* Digit+

 				[6]    nextDimension    ::=    Digit+ ','

 				*/

-				$expr = '/([A-Za-z0-9_]+):([A-Za-z]+[A-Za-z0-9_]+)\[([0-9]+),?([0-9]*)\]/';

-				if(preg_match($expr,$value,$regs)){

-					$this->message[$pos]['typePrefix'] = $regs[1];

-					$this->message[$pos]['arrayTypePrefix'] = $regs[1];

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

-	                	$this->message[$pos]['arrayTypeNamespace'] = $this->namespaces[$regs[1]];

-	                } else if (isset($attrs['xmlns:'.$regs[1]])) {

-						$this->message[$pos]['arrayTypeNamespace'] = $attrs['xmlns:'.$regs[1]];

-	                }

-					$this->message[$pos]['arrayType'] = $regs[2];

-					$this->message[$pos]['arraySize'] = $regs[3];

-					$this->message[$pos]['arrayCols'] = $regs[4];

-				}

-			// specifies nil value (or not)

-			} elseif ($key_localpart == 'nil'){

-				$this->message[$pos]['nil'] = ($value == 'true' || $value == '1');

-			// some other attribute

-			} elseif ($key != 'href' && $key != 'xmlns' && $key_localpart != 'encodingStyle' && $key_localpart != 'root') {

-				$this->message[$pos]['xattrs']['!' . $key] = $value;

-			}

+                $expr = '/([A-Za-z0-9_]+):([A-Za-z]+[A-Za-z0-9_]+)\[([0-9]+),?([0-9]*)\]/';

+                if(preg_match($expr,$value,$regs)){

+                    $this->message[$pos]['typePrefix'] = $regs[1];

+                    $this->message[$pos]['arrayTypePrefix'] = $regs[1];

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

+                        $this->message[$pos]['arrayTypeNamespace'] = $this->namespaces[$regs[1]];

+                    } else if (isset($attrs['xmlns:'.$regs[1]])) {

+                        $this->message[$pos]['arrayTypeNamespace'] = $attrs['xmlns:'.$regs[1]];

+                    }

+                    $this->message[$pos]['arrayType'] = $regs[2];

+                    $this->message[$pos]['arraySize'] = $regs[3];

+                    $this->message[$pos]['arrayCols'] = $regs[4];

+                }

+            // specifies nil value (or not)

+            } elseif ($key_localpart == 'nil'){

+                $this->message[$pos]['nil'] = ($value == 'true' || $value == '1');

+            // some other attribute

+            } elseif ($key != 'href' && $key != 'xmlns' && $key_localpart != 'encodingStyle' && $key_localpart != 'root') {

+                $this->message[$pos]['xattrs']['!' . $key] = $value;

+            }

 

-			if ($key == 'xmlns') {

-				$this->default_namespace = $value;

-			}

-			// log id

-			if($key == 'id'){

-				$this->ids[$value] = $pos;

-			}

-			// root

-			if($key_localpart == 'root' && $value == 1){

-				$this->status = 'method';

-				$this->root_struct_name = $name;

-				$this->root_struct = $pos;

-				$this->debug("found root struct $this->root_struct_name, pos $pos");

-			}

+            if ($key == 'xmlns') {

+                $this->default_namespace = $value;

+            }

+            // log id

+            if($key == 'id'){

+                $this->ids[$value] = $pos;

+            }

+            // root

+            if($key_localpart == 'root' && $value == 1){

+                $this->status = 'method';

+                $this->root_struct_name = $name;

+                $this->root_struct = $pos;

+                $this->debug("found root struct $this->root_struct_name, pos $pos");

+            }

             // for doclit

             $attstr .= " $key=\"$value\"";

-		}

+        }

         // get namespace - must be done after namespace atts are processed

-		if(isset($prefix)){

-			$this->message[$pos]['namespace'] = $this->namespaces[$prefix];

-			$this->default_namespace = $this->namespaces[$prefix];

-		} else {

-			$this->message[$pos]['namespace'] = $this->default_namespace;

-		}

+        if(isset($prefix)){

+            $this->message[$pos]['namespace'] = $this->namespaces[$prefix];

+            $this->default_namespace = $this->namespaces[$prefix];

+        } else {

+            $this->message[$pos]['namespace'] = $this->default_namespace;

+        }

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

-        	if ($this->root_header != $pos) {

-	        	$this->responseHeaders .= "<" . (isset($prefix) ? $prefix . ':' : '') . "$name$attstr>";

-	        }

+            if ($this->root_header != $pos) {

+                $this->responseHeaders .= "<" . (isset($prefix) ? $prefix . ':' : '') . "$name$attstr>";

+            }

         } elseif($this->root_struct_name != ''){

-        	$this->document .= "<" . (isset($prefix) ? $prefix . ':' : '') . "$name$attstr>";

+            $this->document .= "<" . (isset($prefix) ? $prefix . ':' : '') . "$name$attstr>";

         }

-	}

+    }

 

-	/**

-	* end-element handler

-	*

-	* @param    resource $parser XML parser object

-	* @param    string $name element name

-	* @access   private

-	*/

-	function end_element($parser, $name) {

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

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

+    /**

+     * end-element handler

+     *

+     * @param    resource $parser XML parser object

+     * @param    string $name element name

+     * @access   private

+     */

+    function end_element($parser, $name) {

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

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

 

         // get element prefix

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

-			// get ns prefix

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

-			// get unqualified name

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

-		}

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

+            // get ns prefix

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

+            // get unqualified name

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

+        }

 

-		// build to native type

-		if(isset($this->body_position) && $pos > $this->body_position){

-			// deal w/ multirefs

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

-				// get id

-				$id = substr($this->message[$pos]['attrs']['href'],1);

-				// add placeholder to href array

-				$this->multirefs[$id][$pos] = 'placeholder';

-				// add set a reference to it as the result value

-				$this->message[$pos]['result'] =& $this->multirefs[$id][$pos];

+        // build to native type

+        if(isset($this->body_position) && $pos > $this->body_position){

+            // deal w/ multirefs

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

+                // get id

+                $id = substr($this->message[$pos]['attrs']['href'],1);

+                // add placeholder to href array

+                $this->multirefs[$id][$pos] = 'placeholder';

+                // add set a reference to it as the result value

+                $this->message[$pos]['result'] =& $this->multirefs[$id][$pos];

             // build complexType values

-			} elseif($this->message[$pos]['children'] != ''){

-				// if result has already been generated (struct/array)

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

-					$this->message[$pos]['result'] = $this->buildVal($pos);

-				}

-			// build complexType values of attributes and possibly simpleContent

-			} elseif (isset($this->message[$pos]['xattrs'])) {

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

-					$this->message[$pos]['xattrs']['!'] = null;

-				} elseif (isset($this->message[$pos]['cdata']) && trim($this->message[$pos]['cdata']) != '') {

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

-						$this->message[$pos]['xattrs']['!'] = $this->decodeSimple($this->message[$pos]['cdata'], $this->message[$pos]['type'], isset($this->message[$pos]['type_namespace']) ? $this->message[$pos]['type_namespace'] : '');

-					} else {

-						$parent = $this->message[$pos]['parent'];

-						if (isset($this->message[$parent]['type']) && ($this->message[$parent]['type'] == 'array') && isset($this->message[$parent]['arrayType'])) {

-							$this->message[$pos]['xattrs']['!'] = $this->decodeSimple($this->message[$pos]['cdata'], $this->message[$parent]['arrayType'], isset($this->message[$parent]['arrayTypeNamespace']) ? $this->message[$parent]['arrayTypeNamespace'] : '');

-						} else {

-							$this->message[$pos]['xattrs']['!'] = $this->message[$pos]['cdata'];

-						}

-					}

-				}

-				$this->message[$pos]['result'] = $this->message[$pos]['xattrs'];

-			// set value of simpleType (or nil complexType)

-			} else {

-            	//$this->debug('adding data for scalar value '.$this->message[$pos]['name'].' of value '.$this->message[$pos]['cdata']);

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

-					$this->message[$pos]['xattrs']['!'] = null;

-				} elseif (isset($this->message[$pos]['type'])) {

-					$this->message[$pos]['result'] = $this->decodeSimple($this->message[$pos]['cdata'], $this->message[$pos]['type'], isset($this->message[$pos]['type_namespace']) ? $this->message[$pos]['type_namespace'] : '');

-				} else {

-					$parent = $this->message[$pos]['parent'];

-					if (isset($this->message[$parent]['type']) && ($this->message[$parent]['type'] == 'array') && isset($this->message[$parent]['arrayType'])) {

-						$this->message[$pos]['result'] = $this->decodeSimple($this->message[$pos]['cdata'], $this->message[$parent]['arrayType'], isset($this->message[$parent]['arrayTypeNamespace']) ? $this->message[$parent]['arrayTypeNamespace'] : '');

-					} else {

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

-					}

-				}

+            } elseif($this->message[$pos]['children'] != ''){

+                // if result has already been generated (struct/array)

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

+                    $this->message[$pos]['result'] = $this->buildVal($pos);

+                }

+            // build complexType values of attributes and possibly simpleContent

+            } elseif (isset($this->message[$pos]['xattrs'])) {

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

+                    $this->message[$pos]['xattrs']['!'] = null;

+                } elseif (isset($this->message[$pos]['cdata']) && trim($this->message[$pos]['cdata']) != '') {

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

+                        $this->message[$pos]['xattrs']['!'] = $this->decodeSimple($this->message[$pos]['cdata'], $this->message[$pos]['type'], isset($this->message[$pos]['type_namespace']) ? $this->message[$pos]['type_namespace'] : '');

+                    } else {

+                        $parent = $this->message[$pos]['parent'];

+                        if (isset($this->message[$parent]['type']) && ($this->message[$parent]['type'] == 'array') && isset($this->message[$parent]['arrayType'])) {

+                            $this->message[$pos]['xattrs']['!'] = $this->decodeSimple($this->message[$pos]['cdata'], $this->message[$parent]['arrayType'], isset($this->message[$parent]['arrayTypeNamespace']) ? $this->message[$parent]['arrayTypeNamespace'] : '');

+                        } else {

+                            $this->message[$pos]['xattrs']['!'] = $this->message[$pos]['cdata'];

+                        }

+                    }

+                }

+                $this->message[$pos]['result'] = $this->message[$pos]['xattrs'];

+            // set value of simpleType (or nil complexType)

+            } else {

+                //$this->debug('adding data for scalar value '.$this->message[$pos]['name'].' of value '.$this->message[$pos]['cdata']);

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

+                    $this->message[$pos]['xattrs']['!'] = null;

+                } elseif (isset($this->message[$pos]['type'])) {

+                    $this->message[$pos]['result'] = $this->decodeSimple($this->message[$pos]['cdata'], $this->message[$pos]['type'], isset($this->message[$pos]['type_namespace']) ? $this->message[$pos]['type_namespace'] : '');

+                } else {

+                    $parent = $this->message[$pos]['parent'];

+                    if (isset($this->message[$parent]['type']) && ($this->message[$parent]['type'] == 'array') && isset($this->message[$parent]['arrayType'])) {

+                        $this->message[$pos]['result'] = $this->decodeSimple($this->message[$pos]['cdata'], $this->message[$parent]['arrayType'], isset($this->message[$parent]['arrayTypeNamespace']) ? $this->message[$parent]['arrayTypeNamespace'] : '');

+                    } else {

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

+                    }

+                }

 

-				/* add value to parent's result, if parent is struct/array

+                /* add value to parent's result, if parent is struct/array

 				$parent = $this->message[$pos]['parent'];

 				if($this->message[$parent]['type'] != 'map'){

 					if(strtolower($this->message[$parent]['type']) == 'array'){

@@ -380,261 +380,261 @@ 
 					}

 				}

 				*/

-			}

-		}

+            }

+        }

 

         // for doclit

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

-        	if ($this->root_header != $pos) {

-	        	$this->responseHeaders .= "</" . (isset($prefix) ? $prefix . ':' : '') . "$name>";

-	        }

+            if ($this->root_header != $pos) {

+                $this->responseHeaders .= "</" . (isset($prefix) ? $prefix . ':' : '') . "$name>";

+            }

         } elseif($pos >= $this->root_struct){

-        	$this->document .= "</" . (isset($prefix) ? $prefix . ':' : '') . "$name>";

+            $this->document .= "</" . (isset($prefix) ? $prefix . ':' : '') . "$name>";

         }

-		// switch status

-		if ($pos == $this->root_struct){

-			$this->status = 'body';

-			$this->root_struct_namespace = $this->message[$pos]['namespace'];

-		} elseif ($pos == $this->root_header) {

-			$this->status = 'envelope';

-		} elseif ($name == 'Body' && $this->status == 'body') {

-			$this->status = 'envelope';

-		} elseif ($name == 'Header' && $this->status == 'header') { // will never happen

-			$this->status = 'envelope';

-		} elseif ($name == 'Envelope' && $this->status == 'envelope') {

-			$this->status = '';

-		}

-		// set parent back to my parent

-		$this->parent = $this->message[$pos]['parent'];

-	}

+        // switch status

+        if ($pos == $this->root_struct){

+            $this->status = 'body';

+            $this->root_struct_namespace = $this->message[$pos]['namespace'];

+        } elseif ($pos == $this->root_header) {

+            $this->status = 'envelope';

+        } elseif ($name == 'Body' && $this->status == 'body') {

+            $this->status = 'envelope';

+        } elseif ($name == 'Header' && $this->status == 'header') { // will never happen

+            $this->status = 'envelope';

+        } elseif ($name == 'Envelope' && $this->status == 'envelope') {

+            $this->status = '';

+        }

+        // set parent back to my parent

+        $this->parent = $this->message[$pos]['parent'];

+    }

 

-	/**

-	* element content handler

-	*

-	* @param    resource $parser XML parser object

-	* @param    string $data element content

-	* @access   private

-	*/

-	function character_data($parser, $data)

+    /**

+     * element content handler

+     *

+     * @param    resource $parser XML parser object

+     * @param    string $data element content

+     * @access   private

+     */

+    function character_data($parser, $data)

     {

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

-		if ($this->xml_encoding == 'UTF-8'){

-			// TODO: add an option to disable this for folks who want

-			// raw UTF-8 that, e.g., might not map to iso-8859-1

-			// TODO: this can also be handled with xml_parser_set_option($this->parser, XML_OPTION_TARGET_ENCODING, "ISO-8859-1");

-			if($this->decode_utf8){

-				$data = utf8_decode($data);

-			}

-		}

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

+        if ($this->xml_encoding == 'UTF-8'){

+            // TODO: add an option to disable this for folks who want

+            // raw UTF-8 that, e.g., might not map to iso-8859-1

+            // TODO: this can also be handled with xml_parser_set_option($this->parser, XML_OPTION_TARGET_ENCODING, "ISO-8859-1");

+            if($this->decode_utf8){

+                $data = utf8_decode($data);

+            }

+        }

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

         // for doclit

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

-        	$this->responseHeaders .= $data;

+            $this->responseHeaders .= $data;

         } else {

-        	$this->document .= $data;

+            $this->document .= $data;

         }

-	}

+    }

 

-	/**

-	* get the parsed message (SOAP Body)

-	*

-	* @return	mixed

-	* @access   public

-	* @deprecated	use get_soapbody instead

-	*/

-	function get_response(){

-		return $this->soapresponse;

-	}

+    /**

+     * get the parsed message (SOAP Body)

+     *

+     * @return	mixed

+     * @access   public

+     * @deprecated	use get_soapbody instead

+     */

+    function get_response(){

+        return $this->soapresponse;

+    }

 

-	/**

-	* get the parsed SOAP Body (NULL if there was none)

-	*

-	* @return	mixed

-	* @access   public

-	*/

-	function get_soapbody(){

-		return $this->soapresponse;

-	}

+    /**

+     * get the parsed SOAP Body (NULL if there was none)

+     *

+     * @return	mixed

+     * @access   public

+     */

+    function get_soapbody(){

+        return $this->soapresponse;

+    }

 

-	/**

-	* get the parsed SOAP Header (NULL if there was none)

-	*

-	* @return	mixed

-	* @access   public

-	*/

-	function get_soapheader(){

-		return $this->soapheader;

-	}

+    /**

+     * get the parsed SOAP Header (NULL if there was none)

+     *

+     * @return	mixed

+     * @access   public

+     */

+    function get_soapheader(){

+        return $this->soapheader;

+    }

 

-	/**

-	* get the unparsed SOAP Header

-	*

-	* @return	string XML or empty if no Header

-	* @access   public

-	*/

-	function getHeaders(){

-	    return $this->responseHeaders;

-	}

+    /**

+     * get the unparsed SOAP Header

+     *

+     * @return	string XML or empty if no Header

+     * @access   public

+     */

+    function getHeaders(){

+        return $this->responseHeaders;

+    }

 

-	/**

-	* decodes simple types into PHP variables

-	*

-	* @param    string $value value to decode

-	* @param    string $type XML type to decode

-	* @param    string $typens XML type namespace to decode

-	* @return	mixed PHP value

-	* @access   private

-	*/

-	function decodeSimple($value, $type, $typens) {

-		// TODO: use the namespace!

-		if ((!isset($type)) || $type == 'string' || $type == 'long' || $type == 'unsignedLong') {

-			return (string) $value;

-		}

-		if ($type == 'int' || $type == 'integer' || $type == 'short' || $type == 'byte') {

-			return (int) $value;

-		}

-		if ($type == 'float' || $type == 'double' || $type == 'decimal') {

-			return (double) $value;

-		}

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

-			if (strtolower($value) == 'false' || strtolower($value) == 'f') {

-				return false;

-			}

-			return (boolean) $value;

-		}

-		if ($type == 'base64' || $type == 'base64Binary') {

-			$this->debug('Decode base64 value');

-			return base64_decode($value);

-		}

-		// obscure numeric types

-		if ($type == 'nonPositiveInteger' || $type == 'negativeInteger'

-			|| $type == 'nonNegativeInteger' || $type == 'positiveInteger'

-			|| $type == 'unsignedInt'

-			|| $type == 'unsignedShort' || $type == 'unsignedByte') {

-			return (int) $value;

-		}

-		// bogus: parser treats array with no elements as a simple type

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

-			return array();

-		}

-		// everything else

-		return (string) $value;

-	}

+    /**

+     * decodes simple types into PHP variables

+     *

+     * @param    string $value value to decode

+     * @param    string $type XML type to decode

+     * @param    string $typens XML type namespace to decode

+     * @return	mixed PHP value

+     * @access   private

+     */

+    function decodeSimple($value, $type, $typens) {

+        // TODO: use the namespace!

+        if ((!isset($type)) || $type == 'string' || $type == 'long' || $type == 'unsignedLong') {

+            return (string) $value;

+        }

+        if ($type == 'int' || $type == 'integer' || $type == 'short' || $type == 'byte') {

+            return (int) $value;

+        }

+        if ($type == 'float' || $type == 'double' || $type == 'decimal') {

+            return (double) $value;

+        }

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

+            if (strtolower($value) == 'false' || strtolower($value) == 'f') {

+                return false;

+            }

+            return (boolean) $value;

+        }

+        if ($type == 'base64' || $type == 'base64Binary') {

+            $this->debug('Decode base64 value');

+            return base64_decode($value);

+        }

+        // obscure numeric types

+        if ($type == 'nonPositiveInteger' || $type == 'negativeInteger'

+            || $type == 'nonNegativeInteger' || $type == 'positiveInteger'

+            || $type == 'unsignedInt'

+            || $type == 'unsignedShort' || $type == 'unsignedByte') {

+            return (int) $value;

+        }

+        // bogus: parser treats array with no elements as a simple type

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

+            return array();

+        }

+        // everything else

+        return (string) $value;

+    }

 

-	/**

-	* builds response structures for compound values (arrays/structs)

-	* and scalars

-	*

-	* @param    integer $pos position in node tree

-	* @return	mixed	PHP value

-	* @access   private

-	*/

-	function buildVal($pos){

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

-			$this->message[$pos]['type'] = '';

-		}

-		$this->debug('in buildVal() for '.$this->message[$pos]['name']."(pos $pos) of type ".$this->message[$pos]['type']);

-		// if there are children...

-		if($this->message[$pos]['children'] != ''){

-			$this->debug('in buildVal, there are children');

-			$children = explode('|',$this->message[$pos]['children']);

-			array_shift($children); // knock off empty

-			// md array

-			if(isset($this->message[$pos]['arrayCols']) && $this->message[$pos]['arrayCols'] != ''){

-            	$r=0; // rowcount

-            	$c=0; // colcount

-            	foreach($children as $child_pos){

-					$this->debug("in buildVal, got an MD array element: $r, $c");

-					$params[$r][] = $this->message[$child_pos]['result'];

-				    $c++;

-				    if($c == $this->message[$pos]['arrayCols']){

-				    	$c = 0;

-						$r++;

-				    }

+    /**

+     * builds response structures for compound values (arrays/structs)

+     * and scalars

+     *

+     * @param    integer $pos position in node tree

+     * @return	mixed	PHP value

+     * @access   private

+     */

+    function buildVal($pos){

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

+            $this->message[$pos]['type'] = '';

+        }

+        $this->debug('in buildVal() for '.$this->message[$pos]['name']."(pos $pos) of type ".$this->message[$pos]['type']);

+        // if there are children...

+        if($this->message[$pos]['children'] != ''){

+            $this->debug('in buildVal, there are children');

+            $children = explode('|',$this->message[$pos]['children']);

+            array_shift($children); // knock off empty

+            // md array

+            if(isset($this->message[$pos]['arrayCols']) && $this->message[$pos]['arrayCols'] != ''){

+                $r=0; // rowcount

+                $c=0; // colcount

+                foreach($children as $child_pos){

+                    $this->debug("in buildVal, got an MD array element: $r, $c");

+                    $params[$r][] = $this->message[$child_pos]['result'];

+                    $c++;

+                    if($c == $this->message[$pos]['arrayCols']){

+                        $c = 0;

+                        $r++;

+                    }

                 }

             // array

-			} elseif($this->message[$pos]['type'] == 'array' || $this->message[$pos]['type'] == 'Array'){

+            } elseif($this->message[$pos]['type'] == 'array' || $this->message[$pos]['type'] == 'Array'){

                 $this->debug('in buildVal, adding array '.$this->message[$pos]['name']);

                 foreach($children as $child_pos){

-                	$params[] = &$this->message[$child_pos]['result'];

+                    $params[] = &$this->message[$child_pos]['result'];

                 }

             // apache Map type: java hashtable

             } elseif($this->message[$pos]['type'] == 'Map' && $this->message[$pos]['type_namespace'] == 'http://xml.apache.org/xml-soap'){

                 $this->debug('in buildVal, Java Map '.$this->message[$pos]['name']);

                 foreach($children as $child_pos){

-                	$kv = explode("|",$this->message[$child_pos]['children']);

-                   	$params[$this->message[$kv[1]]['result']] = &$this->message[$kv[2]]['result'];

+                    $kv = explode("|",$this->message[$child_pos]['children']);

+                        $params[$this->message[$kv[1]]['result']] = &$this->message[$kv[2]]['result'];

                 }

             // generic compound type

             //} elseif($this->message[$pos]['type'] == 'SOAPStruct' || $this->message[$pos]['type'] == 'struct') {

-		    } else {

-	    		// Apache Vector type: treat as an array

+            } else {

+                // Apache Vector type: treat as an array

                 $this->debug('in buildVal, adding Java Vector or generic compound type '.$this->message[$pos]['name']);

-				if ($this->message[$pos]['type'] == 'Vector' && $this->message[$pos]['type_namespace'] == 'http://xml.apache.org/xml-soap') {

-					$notstruct = 1;

-				} else {

-					$notstruct = 0;

-	            }

-            	//

-            	foreach($children as $child_pos){

-            		if($notstruct){

-            			$params[] = &$this->message[$child_pos]['result'];

-            		} else {

-            			if (isset($params[$this->message[$child_pos]['name']])) {

-            				// de-serialize repeated element name into an array

-            				if ((!is_array($params[$this->message[$child_pos]['name']])) || (!isset($params[$this->message[$child_pos]['name']][0]))) {

-            					$params[$this->message[$child_pos]['name']] = array($params[$this->message[$child_pos]['name']]);

-            				}

-            				$params[$this->message[$child_pos]['name']][] = &$this->message[$child_pos]['result'];

-            			} else {

-					    	$params[$this->message[$child_pos]['name']] = &$this->message[$child_pos]['result'];

-					    }

-                	}

+                if ($this->message[$pos]['type'] == 'Vector' && $this->message[$pos]['type_namespace'] == 'http://xml.apache.org/xml-soap') {

+                    $notstruct = 1;

+                } else {

+                    $notstruct = 0;

                 }

-			}

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

+                //

+                foreach($children as $child_pos){

+                    if($notstruct){

+                        $params[] = &$this->message[$child_pos]['result'];

+                    } else {

+                        if (isset($params[$this->message[$child_pos]['name']])) {

+                            // de-serialize repeated element name into an array

+                            if ((!is_array($params[$this->message[$child_pos]['name']])) || (!isset($params[$this->message[$child_pos]['name']][0]))) {

+                                $params[$this->message[$child_pos]['name']] = array($params[$this->message[$child_pos]['name']]);

+                            }

+                            $params[$this->message[$child_pos]['name']][] = &$this->message[$child_pos]['result'];

+                        } else {

+                            $params[$this->message[$child_pos]['name']] = &$this->message[$child_pos]['result'];

+                        }

+                    }

+                }

+            }

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

                 $this->debug('in buildVal, handling attributes');

-				foreach ($this->message[$pos]['xattrs'] as $n => $v) {

-					$params[$n] = $v;

-				}

-			}

-			// handle simpleContent

-			if (isset($this->message[$pos]['cdata']) && trim($this->message[$pos]['cdata']) != '') {

+                foreach ($this->message[$pos]['xattrs'] as $n => $v) {

+                    $params[$n] = $v;

+                }

+            }

+            // handle simpleContent

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

                 $this->debug('in buildVal, handling simpleContent');

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

-					$params['!'] = $this->decodeSimple($this->message[$pos]['cdata'], $this->message[$pos]['type'], isset($this->message[$pos]['type_namespace']) ? $this->message[$pos]['type_namespace'] : '');

-				} else {

-					$parent = $this->message[$pos]['parent'];

-					if (isset($this->message[$parent]['type']) && ($this->message[$parent]['type'] == 'array') && isset($this->message[$parent]['arrayType'])) {

-						$params['!'] = $this->decodeSimple($this->message[$pos]['cdata'], $this->message[$parent]['arrayType'], isset($this->message[$parent]['arrayTypeNamespace']) ? $this->message[$parent]['arrayTypeNamespace'] : '');

-					} else {

-						$params['!'] = $this->message[$pos]['cdata'];

-					}

-				}

-			}

-			$ret = is_array($params) ? $params : array();

-			$this->debug('in buildVal, return:');

-			//$this->appendDebug($this->varDump($ret));

-			return $ret;

-		} else {

-        	$this->debug('in buildVal, no children, building scalar');

-			$cdata = isset($this->message[$pos]['cdata']) ? $this->message[$pos]['cdata'] : '';

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

-				$ret = $this->decodeSimple($cdata, $this->message[$pos]['type'], isset($this->message[$pos]['type_namespace']) ? $this->message[$pos]['type_namespace'] : '');

-				$this->debug("in buildVal, return: $ret");

-				return $ret;

-			}

-			$parent = $this->message[$pos]['parent'];

-			if (isset($this->message[$parent]['type']) && ($this->message[$parent]['type'] == 'array') && isset($this->message[$parent]['arrayType'])) {

-				$ret = $this->decodeSimple($cdata, $this->message[$parent]['arrayType'], isset($this->message[$parent]['arrayTypeNamespace']) ? $this->message[$parent]['arrayTypeNamespace'] : '');

-				$this->debug("in buildVal, return: $ret");

-				return $ret;

-			}

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

-			$this->debug("in buildVal, return: $ret");

-           	return $ret;

-		}

-	}

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

+                    $params['!'] = $this->decodeSimple($this->message[$pos]['cdata'], $this->message[$pos]['type'], isset($this->message[$pos]['type_namespace']) ? $this->message[$pos]['type_namespace'] : '');

+                } else {

+                    $parent = $this->message[$pos]['parent'];

+                    if (isset($this->message[$parent]['type']) && ($this->message[$parent]['type'] == 'array') && isset($this->message[$parent]['arrayType'])) {

+                        $params['!'] = $this->decodeSimple($this->message[$pos]['cdata'], $this->message[$parent]['arrayType'], isset($this->message[$parent]['arrayTypeNamespace']) ? $this->message[$parent]['arrayTypeNamespace'] : '');

+                    } else {

+                        $params['!'] = $this->message[$pos]['cdata'];

+                    }

+                }

+            }

+            $ret = is_array($params) ? $params : array();

+            $this->debug('in buildVal, return:');

+            //$this->appendDebug($this->varDump($ret));

+            return $ret;

+        } else {

+            $this->debug('in buildVal, no children, building scalar');

+            $cdata = isset($this->message[$pos]['cdata']) ? $this->message[$pos]['cdata'] : '';

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

+                $ret = $this->decodeSimple($cdata, $this->message[$pos]['type'], isset($this->message[$pos]['type_namespace']) ? $this->message[$pos]['type_namespace'] : '');

+                $this->debug("in buildVal, return: $ret");

+                return $ret;

+            }

+            $parent = $this->message[$pos]['parent'];

+            if (isset($this->message[$parent]['type']) && ($this->message[$parent]['type'] == 'array') && isset($this->message[$parent]['arrayType'])) {

+                $ret = $this->decodeSimple($cdata, $this->message[$parent]['arrayType'], isset($this->message[$parent]['arrayTypeNamespace']) ? $this->message[$parent]['arrayTypeNamespace'] : '');

+                $this->debug("in buildVal, return: $ret");

+                return $ret;

+            }

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

+            $this->debug("in buildVal, return: $ret");

+                return $ret;

+        }

+    }

 }

 

 /**

Spacing +76 added lines, -76 removed lines

@@ -18,7 +18,7 @@ 
 	var $root_struct_name = '';

 	var $root_struct_namespace = '';

 	var $root_header = '';

-    var $document = '';			// incoming SOAP body (text)

+    var $document = ''; // incoming SOAP body (text)

 	// determines where in the message we are (envelope,header,body,method)

 	var $status = '';

 	var $position = 0;

@@ -33,9 +33,9 @@ 
 	var $fault_detail = '';

 	var $depth_array = array();

 	var $debug_flag = true;

-	var $soapresponse = NULL;	// parsed SOAP Body

-	var $soapheader = NULL;		// parsed SOAP Header

-	var $responseHeaders = '';	// incoming SOAP headers (text)

+	var $soapresponse = NULL; // parsed SOAP Body

+	var $soapheader = NULL; // parsed SOAP Header

+	var $responseHeaders = ''; // incoming SOAP headers (text)

 	var $body_position = 0;

 	// for multiref parsing:

 	// array of id => pos

@@ -55,7 +55,7 @@ 
 	* @return void|bool

 	* @access   public

 	*/

-	function __construct($xml,$encoding='UTF-8',$method='',$decode_utf8=true)

+	function __construct($xml, $encoding = 'UTF-8', $method = '', $decode_utf8 = true)

     {

 		parent::__construct();

 		$this->xml = $xml;

@@ -64,7 +64,7 @@ 
 		$this->decode_utf8 = $decode_utf8;

 

 		// Check whether content has been read.

-		if(!empty($this->xml)){

+		if (!empty($this->xml)) {

 			// Check XML encoding

 			$pos_xml = strpos($xml, '<?xml');

 			if ($pos_xml !== FALSE) {

@@ -72,7 +72,7 @@ 
 				if (preg_match("/encoding=[\"']([^\"']*)[\"']/", $xml_decl, $res)) {

 					$xml_encoding = $res[1];

 					if (strtoupper($xml_encoding) != $encoding) {

-						$err = "Charset from HTTP Content-Type '" . $encoding . "' does not match encoding from XML declaration '" . $xml_encoding . "'";

+						$err = "Charset from HTTP Content-Type '".$encoding."' does not match encoding from XML declaration '".$xml_encoding."'";

 						$this->debug($err);

 						if ($encoding != 'ISO-8859-1' || strtoupper($xml_encoding) != 'UTF-8') {

 							$this->setError($err);

@@ -98,8 +98,8 @@ 
 			// Set the object for the parser.

 			xml_set_object($this->parser, $this);

 			// Set the element handlers for the parser.

-			xml_set_element_handler($this->parser, 'start_element','end_element');

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

+			xml_set_element_handler($this->parser, 'start_element', 'end_element');

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

 

 			xml_parse($this->parser, $this->xml);

 

@@ -111,7 +111,7 @@ 
 			    xml_get_current_line_number($this->parser),

 			    xml_error_string(xml_get_error_code($this->parser)));

 				$this->debug($err);

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

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

 				$this->setError($err);

 			} else {

 				$this->debug('in nusoap_parser ctor, message:');

@@ -120,18 +120,18 @@ 
 				// get final value

 				$this->soapresponse = $this->message[$this->root_struct]['result'];

 				// get header value

-				if($this->root_header != '' && isset($this->message[$this->root_header]['result'])){

+				if ($this->root_header != '' && isset($this->message[$this->root_header]['result'])) {

 					$this->soapheader = $this->message[$this->root_header]['result'];

 				}

 				// resolve hrefs/ids

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

-					foreach($this->multirefs as $id => $hrefs){

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

+					foreach ($this->multirefs as $id => $hrefs) {

 						$this->debug('resolving multirefs for id: '.$id);

 						$idVal = $this->buildVal($this->ids[$id]);

 						if (is_array($idVal) && isset($idVal['!id'])) {

 							unset($idVal['!id']);

 						}

-						foreach($hrefs as $refPos => $ref){

+						foreach ($hrefs as $refPos => $ref) {

 							$this->debug('resolving href at pos '.$refPos);

 							$this->multirefs[$id][$refPos] = $idVal;

 						}

@@ -159,13 +159,13 @@ 
 		// update class level pos

 		$pos = $this->position++;

 		// and set mine

-		$this->message[$pos] = array('pos' => $pos,'children'=>'','cdata'=>'');

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

 		// depth = how many levels removed from root?

 		// set mine as current global depth and increment global depth value

 		$this->message[$pos]['depth'] = $this->depth++;

 

 		// else add self as child to whoever the current parent is

-		if($pos != 0){

+		if ($pos != 0) {

 			$this->message[$this->parent]['children'] .= '|'.$pos;

 		}

 		// set my parent

@@ -175,11 +175,11 @@ 
 		// set self as current value for this depth

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

 		// get element prefix

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

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

 			// get ns prefix

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

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

 			// get unqualified name

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

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

 		}

 		// set status

 		if ($name == 'Envelope' && $this->status == '') {

@@ -187,11 +187,11 @@ 
 		} elseif ($name == 'Header' && $this->status == 'envelope') {

 			$this->root_header = $pos;

 			$this->status = 'header';

-		} elseif ($name == 'Body' && $this->status == 'envelope'){

+		} elseif ($name == 'Body' && $this->status == 'envelope') {

 			$this->status = 'body';

 			$this->body_position = $pos;

 		// set method

-		} elseif($this->status == 'body' && $pos == ($this->body_position+1)) {

+		} elseif ($this->status == 'body' && $pos == ($this->body_position + 1)) {

 			$this->status = 'method';

 			$this->root_struct_name = $name;

 			$this->root_struct = $pos;

@@ -207,23 +207,23 @@ 
 

 		// loop through atts, logging ns and type declarations

         $attstr = '';

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

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

         	$key_prefix = $this->getPrefix($key);

 			$key_localpart = $this->getLocalPart($key);

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

-            if($key_prefix == 'xmlns'){

-				if(preg_match('/^http:\/\/www.w3.org\/[0-9]{4}\/XMLSchema$/',$value)){

+            if ($key_prefix == 'xmlns') {

+				if (preg_match('/^http:\/\/www.w3.org\/[0-9]{4}\/XMLSchema$/', $value)) {

 					$this->XMLSchemaVersion = $value;

 					$this->namespaces['xsd'] = $this->XMLSchemaVersion;

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

 				}

                 $this->namespaces[$key_localpart] = $value;

 				// set method namespace

-				if($name == $this->root_struct_name){

+				if ($name == $this->root_struct_name) {

 					$this->methodNamespace = $value;

 				}

 			// if it's a type declaration, set type

-        } elseif($key_localpart == 'type'){

+        } elseif ($key_localpart == 'type') {

         		if (isset($this->message[$pos]['type']) && $this->message[$pos]['type'] == 'array') {

         			// do nothing: already processed arrayType

         		} else {

@@ -231,14 +231,14 @@ 
 	                $value_localpart = $this->getLocalPart($value);

 					$this->message[$pos]['type'] = $value_localpart;

 					$this->message[$pos]['typePrefix'] = $value_prefix;

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

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

 	                	$this->message[$pos]['type_namespace'] = $this->namespaces[$value_prefix];

-	                } else if(isset($attrs['xmlns:'.$value_prefix])) {

+	                } else if (isset($attrs['xmlns:'.$value_prefix])) {

 						$this->message[$pos]['type_namespace'] = $attrs['xmlns:'.$value_prefix];

 	                }

 					// should do something here with the namespace of specified type?

 				}

-			} elseif($key_localpart == 'arrayType'){

+			} elseif ($key_localpart == 'arrayType') {

 				$this->message[$pos]['type'] = 'array';

 				/* do arrayType ereg here

 				[1]    arrayTypeValue    ::=    atype asize

@@ -249,7 +249,7 @@ 
 				[6]    nextDimension    ::=    Digit+ ','

 				*/

 				$expr = '/([A-Za-z0-9_]+):([A-Za-z]+[A-Za-z0-9_]+)\[([0-9]+),?([0-9]*)\]/';

-				if(preg_match($expr,$value,$regs)){

+				if (preg_match($expr, $value, $regs)) {

 					$this->message[$pos]['typePrefix'] = $regs[1];

 					$this->message[$pos]['arrayTypePrefix'] = $regs[1];

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

@@ -262,22 +262,22 @@ 
 					$this->message[$pos]['arrayCols'] = $regs[4];

 				}

 			// specifies nil value (or not)

-			} elseif ($key_localpart == 'nil'){

+			} elseif ($key_localpart == 'nil') {

 				$this->message[$pos]['nil'] = ($value == 'true' || $value == '1');

 			// some other attribute

 			} elseif ($key != 'href' && $key != 'xmlns' && $key_localpart != 'encodingStyle' && $key_localpart != 'root') {

-				$this->message[$pos]['xattrs']['!' . $key] = $value;

+				$this->message[$pos]['xattrs']['!'.$key] = $value;

 			}

 

 			if ($key == 'xmlns') {

 				$this->default_namespace = $value;

 			}

 			// log id

-			if($key == 'id'){

+			if ($key == 'id') {

 				$this->ids[$value] = $pos;

 			}

 			// root

-			if($key_localpart == 'root' && $value == 1){

+			if ($key_localpart == 'root' && $value == 1) {

 				$this->status = 'method';

 				$this->root_struct_name = $name;

 				$this->root_struct = $pos;

@@ -287,18 +287,18 @@ 
             $attstr .= " $key=\"$value\"";

 		}

         // get namespace - must be done after namespace atts are processed

-		if(isset($prefix)){

+		if (isset($prefix)) {

 			$this->message[$pos]['namespace'] = $this->namespaces[$prefix];

 			$this->default_namespace = $this->namespaces[$prefix];

 		} else {

 			$this->message[$pos]['namespace'] = $this->default_namespace;

 		}

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

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

         	if ($this->root_header != $pos) {

-	        	$this->responseHeaders .= "<" . (isset($prefix) ? $prefix . ':' : '') . "$name$attstr>";

+	        	$this->responseHeaders .= "<".(isset($prefix) ? $prefix.':' : '')."$name$attstr>";

 	        }

-        } elseif($this->root_struct_name != ''){

-        	$this->document .= "<" . (isset($prefix) ? $prefix . ':' : '') . "$name$attstr>";

+        } elseif ($this->root_struct_name != '') {

+        	$this->document .= "<".(isset($prefix) ? $prefix.':' : '')."$name$attstr>";

         }

 	}

 

@@ -314,27 +314,27 @@ 
 		$pos = $this->depth_array[$this->depth--];

 

         // get element prefix

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

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

 			// get ns prefix

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

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

 			// get unqualified name

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

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

 		}

 

 		// build to native type

-		if(isset($this->body_position) && $pos > $this->body_position){

+		if (isset($this->body_position) && $pos > $this->body_position) {

 			// deal w/ multirefs

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

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

 				// get id

-				$id = substr($this->message[$pos]['attrs']['href'],1);

+				$id = substr($this->message[$pos]['attrs']['href'], 1);

 				// add placeholder to href array

 				$this->multirefs[$id][$pos] = 'placeholder';

 				// add set a reference to it as the result value

-				$this->message[$pos]['result'] =& $this->multirefs[$id][$pos];

+				$this->message[$pos]['result'] = & $this->multirefs[$id][$pos];

             // build complexType values

-			} elseif($this->message[$pos]['children'] != ''){

+			} elseif ($this->message[$pos]['children'] != '') {

 				// if result has already been generated (struct/array)

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

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

 					$this->message[$pos]['result'] = $this->buildVal($pos);

 				}

 			// build complexType values of attributes and possibly simpleContent

@@ -384,15 +384,15 @@ 
 		}

 

         // for doclit

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

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

         	if ($this->root_header != $pos) {

-	        	$this->responseHeaders .= "</" . (isset($prefix) ? $prefix . ':' : '') . "$name>";

+	        	$this->responseHeaders .= "</".(isset($prefix) ? $prefix.':' : '')."$name>";

 	        }

-        } elseif($pos >= $this->root_struct){

-        	$this->document .= "</" . (isset($prefix) ? $prefix . ':' : '') . "$name>";

+        } elseif ($pos >= $this->root_struct) {

+        	$this->document .= "</".(isset($prefix) ? $prefix.':' : '')."$name>";

         }

 		// switch status

-		if ($pos == $this->root_struct){

+		if ($pos == $this->root_struct) {

 			$this->status = 'body';

 			$this->root_struct_namespace = $this->message[$pos]['namespace'];

 		} elseif ($pos == $this->root_header) {

@@ -418,17 +418,17 @@ 
 	function character_data($parser, $data)

     {

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

-		if ($this->xml_encoding == 'UTF-8'){

+		if ($this->xml_encoding == 'UTF-8') {

 			// TODO: add an option to disable this for folks who want

 			// raw UTF-8 that, e.g., might not map to iso-8859-1

 			// TODO: this can also be handled with xml_parser_set_option($this->parser, XML_OPTION_TARGET_ENCODING, "ISO-8859-1");

-			if($this->decode_utf8){

+			if ($this->decode_utf8) {

 				$data = utf8_decode($data);

 			}

 		}

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

         // for doclit

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

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

         	$this->responseHeaders .= $data;

         } else {

         	$this->document .= $data;

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

 	* @deprecated	use get_soapbody instead

 	*/

-	function get_response(){

+	function get_response() {

 		return $this->soapresponse;

 	}

 

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

 	* @access   public

 	*/

-	function get_soapbody(){

+	function get_soapbody() {

 		return $this->soapresponse;

 	}

 

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

 	* @access   public

 	*/

-	function get_soapheader(){

+	function get_soapheader() {

 		return $this->soapheader;

 	}

 

@@ -472,7 +472,7 @@ 
 	* @return	string XML or empty if no Header

 	* @access   public

 	*/

-	function getHeaders(){

+	function getHeaders() {

 	    return $this->responseHeaders;

 	}

 

@@ -529,40 +529,40 @@ 
 	* @return	mixed	PHP value

 	* @access   private

 	*/

-	function buildVal($pos){

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

+	function buildVal($pos) {

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

 			$this->message[$pos]['type'] = '';

 		}

 		$this->debug('in buildVal() for '.$this->message[$pos]['name']."(pos $pos) of type ".$this->message[$pos]['type']);

 		// if there are children...

-		if($this->message[$pos]['children'] != ''){

+		if ($this->message[$pos]['children'] != '') {

 			$this->debug('in buildVal, there are children');

-			$children = explode('|',$this->message[$pos]['children']);

+			$children = explode('|', $this->message[$pos]['children']);

 			array_shift($children); // knock off empty

 			// md array

-			if(isset($this->message[$pos]['arrayCols']) && $this->message[$pos]['arrayCols'] != ''){

-            	$r=0; // rowcount

-            	$c=0; // colcount

-            	foreach($children as $child_pos){

+			if (isset($this->message[$pos]['arrayCols']) && $this->message[$pos]['arrayCols'] != '') {

+            	$r = 0; // rowcount

+            	$c = 0; // colcount

+            	foreach ($children as $child_pos) {

 					$this->debug("in buildVal, got an MD array element: $r, $c");

 					$params[$r][] = $this->message[$child_pos]['result'];

 				    $c++;

-				    if($c == $this->message[$pos]['arrayCols']){

+				    if ($c == $this->message[$pos]['arrayCols']) {

 				    	$c = 0;

 						$r++;

 				    }

                 }

             // array

-			} elseif($this->message[$pos]['type'] == 'array' || $this->message[$pos]['type'] == 'Array'){

+			} elseif ($this->message[$pos]['type'] == 'array' || $this->message[$pos]['type'] == 'Array') {

                 $this->debug('in buildVal, adding array '.$this->message[$pos]['name']);

-                foreach($children as $child_pos){

+                foreach ($children as $child_pos) {

                 	$params[] = &$this->message[$child_pos]['result'];

                 }

             // apache Map type: java hashtable

-            } elseif($this->message[$pos]['type'] == 'Map' && $this->message[$pos]['type_namespace'] == 'http://xml.apache.org/xml-soap'){

+            } elseif ($this->message[$pos]['type'] == 'Map' && $this->message[$pos]['type_namespace'] == 'http://xml.apache.org/xml-soap') {

                 $this->debug('in buildVal, Java Map '.$this->message[$pos]['name']);

-                foreach($children as $child_pos){

-                	$kv = explode("|",$this->message[$child_pos]['children']);

+                foreach ($children as $child_pos) {

+                	$kv = explode("|", $this->message[$child_pos]['children']);

                    	$params[$this->message[$kv[1]]['result']] = &$this->message[$kv[2]]['result'];

                 }

             // generic compound type

@@ -576,8 +576,8 @@ 
 					$notstruct = 0;

 	            }

             	//

-            	foreach($children as $child_pos){

-            		if($notstruct){

+            	foreach ($children as $child_pos) {

+            		if ($notstruct) {

             			$params[] = &$this->message[$child_pos]['result'];

             		} else {

             			if (isset($params[$this->message[$child_pos]['name']])) {