chamilo / chamilo-lms

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

                 ]

             );

main/auth/inscription.php

Spacing +19 added lines, -19 removed lines

@@ -77,7 +77,7 @@ 
             };
 
             var geoError = function(error) {
-                alert("Geocode ' . get_lang('Error') . ': " + error);
+                alert("Geocode ' . get_lang('Error').': " + error);
             };
 
             var geoOptions = {
@@ -128,11 +128,11 @@ 
                             infowindow.open(map, marker);
                         });
                     } else {
-                        alert("' . get_lang("NotFound") . '");
+                        alert("' . get_lang("NotFound").'");
                     }
 
                 } else {
-                    alert("Geocode ' . get_lang('Error') . ': " + status);
+                    alert("Geocode ' . get_lang('Error').': " + status);
                 }
             });
         }
@@ -182,7 +182,7 @@ 
         if (api_get_setting('registration', 'email') != 'true') {
             $form->addRule('email', get_lang('ThisFieldIsRequired'), 'required');
         }
-        $form->addRule('email', sprintf(get_lang('UsernameMaxXCharacters'), (string)USERNAME_MAX_LENGTH), 'maxlength', USERNAME_MAX_LENGTH);
+        $form->addRule('email', sprintf(get_lang('UsernameMaxXCharacters'), (string) USERNAME_MAX_LENGTH), 'maxlength', USERNAME_MAX_LENGTH);
         $form->addRule('email', get_lang('UserTaken'), 'username_available');
     }
 
@@ -215,7 +215,7 @@ 
         $form->addElement('text', 'username', get_lang('UserName'), array('id' => 'username', 'size' => USERNAME_MAX_LENGTH));
         $form->applyFilter('username', 'trim');
         $form->addRule('username', get_lang('ThisFieldIsRequired'), 'required');
-        $form->addRule('username', sprintf(get_lang('UsernameMaxXCharacters'), (string)USERNAME_MAX_LENGTH), 'maxlength', USERNAME_MAX_LENGTH);
+        $form->addRule('username', sprintf(get_lang('UsernameMaxXCharacters'), (string) USERNAME_MAX_LENGTH), 'maxlength', USERNAME_MAX_LENGTH);
         $form->addRule('username', get_lang('UsernameWrong'), 'username');
         $form->addRule('username', get_lang('UserTaken'), 'username_available');
     }
@@ -246,7 +246,7 @@ 
     if (CHECK_PASS_EASY_TO_FIND) {
         $form->addRule(
             'password1',
-            get_lang('PassTooEasy') . ': ' . api_generate_password(),
+            get_lang('PassTooEasy').': '.api_generate_password(),
             'callback',
             'api_check_password'
         );
@@ -276,8 +276,8 @@ 
                 <div class="form-group">
                     <label for="geolocalization" class="col-sm-2 control-label"></label>
                     <div class="col-sm-8">
-                        <button class="null btn btn-default " id="geolocalization" name="geolocalization" type="submit"><em class="fa fa-map-marker"></em> ' . get_lang('Geolocalization') . '</button>
-                        <button class="null btn btn-default " id="myLocation" name="myLocation" type="submit"><em class="fa fa-crosshairs"></em> ' . get_lang('MyLocation') . '</button>
+                        <button class="null btn btn-default " id="geolocalization" name="geolocalization" type="submit"><em class="fa fa-map-marker"></em> ' . get_lang('Geolocalization').'</button>
+                        <button class="null btn btn-default " id="myLocation" name="myLocation" type="submit"><em class="fa fa-crosshairs"></em> ' . get_lang('MyLocation').'</button>
                     </div>
                 </div>
             ');
@@ -285,7 +285,7 @@ 
             $form->addHtml('
                 <div class="form-group">
                     <label for="map" class="col-sm-2 control-label">
-                        ' . get_lang('Map') . '
+                        ' . get_lang('Map').'
                     </label>
                     <div class="col-sm-8">
                         <div name="map" id="map" style="width:100%; height:300px;">
@@ -345,7 +345,7 @@ 
             )
         );
 
-        $captcha_question =  $form->addElement('CAPTCHA_Image', 'captcha_question', '', $options);
+        $captcha_question = $form->addElement('CAPTCHA_Image', 'captcha_question', '', $options);
         $form->addElement('static', null, null, get_lang('ClickOnTheImageForANewOne'));
 
         $form->addElement('text', 'captcha', get_lang('EnterTheLettersYouSee'), array('size' => 40));
@@ -486,7 +486,7 @@ 
         }
     }
 
-    $tool_name = get_lang('Registration', null, (!empty($_POST['language'])?$_POST['language']: $_user['language']));
+    $tool_name = get_lang('Registration', null, (!empty($_POST['language']) ? $_POST['language'] : $_user['language']));
 
     if (api_get_setting('allow_terms_conditions') === 'true' && $user_already_registered_show_terms) {
         $tool_name = get_lang('TermsAndConditions');
@@ -507,7 +507,7 @@ 
     }
 
     if (file_exists($home.'register_top_'.$user_selected_language.'.html')) {
-        $home_top_temp = @(string)file_get_contents($home.'register_top_'.$user_selected_language.'.html');
+        $home_top_temp = @(string) file_get_contents($home.'register_top_'.$user_selected_language.'.html');
         $open = str_replace('{rel_path}', api_get_path(REL_PATH), $home_top_temp);
         $open = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));
         if (!empty($open)) {
@@ -537,7 +537,7 @@ 
         if (api_get_setting('show_terms_if_profile_completed') === 'true') {
             $userInfo = api_get_user_info();
             if ($userInfo) {
-                if ((int)$userInfo['profile_completed'] !== 1) {
+                if ((int) $userInfo['profile_completed'] !== 1) {
                     api_not_allowed(true);
                 }
             }
@@ -747,7 +747,7 @@ 
                 Database::query($sql);
 
                 // 2. Send mail to all platform admin
-                $emailsubject  = get_lang('ApprovalForNewAccount', null, $values['language']).': '.$values['username'];
+                $emailsubject = get_lang('ApprovalForNewAccount', null, $values['language']).': '.$values['username'];
                 $emailbody = get_lang('ApprovalForNewAccount', null, $values['language'])."\n";
                 $emailbody .= get_lang('UserName', null, $values['language']).': '.$values['username']."\n";
 
@@ -850,7 +850,7 @@ 
         '<p>'.
         get_lang('Dear', null, $_user['language']).' '.
         stripslashes(Security::remove_XSS($recipient_name)).',<br /><br />'.
-        get_lang('PersonalSettings',null,$_user['language']).".</p>";
+        get_lang('PersonalSettings', null, $_user['language']).".</p>";
 
     $form_data = array(
         'button' => Display::button('next', get_lang('Next', null, $_user['language']), array('class' => 'btn btn-primary btn-large')),
@@ -874,14 +874,14 @@ 
         }
     } else {
         if (!empty($values['email'])) {
-            $text_after_registration.= '<p>'.get_lang('MailHasBeenSent', null, $_user['language']).'.</p>';
+            $text_after_registration .= '<p>'.get_lang('MailHasBeenSent', null, $_user['language']).'.</p>';
         }
 
         if ($is_allowedCreateCourse) {
             if ($usersCanCreateCourse) {
-                $form_data['message'] = '<p>'. get_lang('NowGoCreateYourCourse', null, $_user['language']). "</p>";
+                $form_data['message'] = '<p>'.get_lang('NowGoCreateYourCourse', null, $_user['language'])."</p>";
             }
-            $form_data['action']  = api_get_path(WEB_CODE_PATH).'create_course/add_course.php';
+            $form_data['action'] = api_get_path(WEB_CODE_PATH).'create_course/add_course.php';
 
             if (api_get_setting('course_validation') === 'true') {
                 $form_data['button'] = Display::button(
@@ -904,7 +904,7 @@ 
         } else {
             if (api_get_setting('allow_students_to_browse_courses') == 'true') {
                 $form_data['action'] = 'courses.php?action=subscribe';
-                $form_data['message'] = '<p>'. get_lang('NowGoChooseYourCourses', null, $_user['language']). ".</p>";
+                $form_data['message'] = '<p>'.get_lang('NowGoChooseYourCourses', null, $_user['language']).".</p>";
             } else {
                 $form_data['action'] = api_get_path(WEB_PATH).'user_portal.php';
             }

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

custompages/language.inc.php

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;

custompages/language.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
  * @package chamilo.custompages
  */
 // Get helper functions
-require_once __DIR__ . '/language.inc.php';
+require_once __DIR__.'/language.inc.php';
 
 // Define the languages you want to make available for auto-detection here
 $available_langs = array('en', 'fr', 'es', 'gl', 'eu');

main/admin/add_courses_to_usergroup.php

Spacing +11 added lines, -11 removed lines

@@ -19,14 +19,14 @@ 
 api_protect_admin_script(true);
 
 // Setting breadcrumbs.
-$interbreadcrumb[] = array('url' => 'index.php','name' => get_lang('PlatformAdmin'));
-$interbreadcrumb[] = array('url' => 'usergroups.php','name' => get_lang('Classes'));
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array('url' => 'usergroups.php', 'name' => get_lang('Classes'));
 
 // Setting the name of the tool.
 $tool_name = get_lang('SubscribeClassToCourses');
 
 $add_type = 'multiple';
-if (isset($_REQUEST['add_type']) && $_REQUEST['add_type']!=''){
+if (isset($_REQUEST['add_type']) && $_REQUEST['add_type'] != '') {
     $add_type = Security::remove_XSS($_REQUEST['add_type']);
 }
 
@@ -97,7 +97,7 @@ 
 
 $searchForm = new FormValidator('search', 'get', api_get_self().'?id='.$id);
 $searchForm->addHeader(get_lang('AdvancedSearch'));
-$renderer =& $searchForm->defaultRenderer();
+$renderer = & $searchForm->defaultRenderer();
 $searchForm->addElement('hidden', 'id', $id);
 foreach ($filters as $param) {
     $searchForm->addElement($param['type'], $param['name'], $param['label']);
@@ -141,7 +141,7 @@ 
 
 //checking for extra field with filter on
 
-function search($needle,$type)
+function search($needle, $type)
 {
     global $elements_in;
     $xajax_response = new xajaxResponse();
@@ -180,7 +180,7 @@ 
 }
 
 echo '<div class="actions">';
-echo '<a href="usergroups.php">'.Display::return_icon('back.png',get_lang('Back'), array(), ICON_SIZE_MEDIUM).'</a>';
+echo '<a href="usergroups.php">'.Display::return_icon('back.png', get_lang('Back'), array(), ICON_SIZE_MEDIUM).'</a>';
 echo Display::url(get_lang('AdvancedSearch'), '#', array('class' => 'advanced_options', 'id' => 'advanced_search'));
 echo '</div>';
 
@@ -190,7 +190,7 @@ 
 
 ?>
 
-<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?id=<?php echo $id; if(!empty($_GET['add'])) echo '&add=true' ; ?>" style="margin:0px;" <?php if($ajax_search){echo ' onsubmit="valide();"';}?>>
+<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?id=<?php echo $id; if (!empty($_GET['add'])) echo '&add=true'; ?>" style="margin:0px;" <?php if ($ajax_search) {echo ' onsubmit="valide();"'; }?>>
 
 <?php echo '<legend>'.$data['name'].': '.$tool_name.'</legend>';
 echo Display::input('hidden', 'id', $id);
@@ -209,7 +209,7 @@ 
   <td align="center"><b><?php echo get_lang('CoursesInGroup') ?> :</b></td>
 </tr>
 
-<?php if ($add_type=='multiple') { ?>
+<?php if ($add_type == 'multiple') { ?>
 <tr>
 <td align="center">
 <?php echo get_lang('FirstLetterCourseTitle'); ?> :
@@ -227,7 +227,7 @@ 
   <td align="center">
   <div id="content_source">
       <?php
-      if (!($add_type=='multiple')) {
+      if (!($add_type == 'multiple')) {
         ?>
         <input type="text" id="user_to_add" onkeyup="xajax_search_users(this.value,'single')" />
         <div id="ajax_list_users_single"></div>
@@ -235,7 +235,7 @@ 
       } else {
       ?>
       <div id="ajax_list_multiple">
-        <?php echo Display::select('elements_not_in_name', $elements_not_in, '', array('style'=>'width:360px', 'multiple'=>'multiple','id'=>'elements_not_in','size'=>'15px'),false); ?>
+        <?php echo Display::select('elements_not_in_name', $elements_not_in, '', array('style'=>'width:360px', 'multiple'=>'multiple', 'id'=>'elements_not_in', 'size'=>'15px'), false); ?>
       </div>
     <?php
       }
@@ -266,7 +266,7 @@ 
   </td>
   <td align="center">
 <?php
-    echo Display::select('elements_in_name[]', $elements_in, '', array('style'=>'width:360px', 'multiple'=>'multiple','id'=>'elements_in','size'=>'15px'),false );
+    echo Display::select('elements_in_name[]', $elements_in, '', array('style'=>'width:360px', 'multiple'=>'multiple', 'id'=>'elements_in', 'size'=>'15px'), false);
     unset($sessionUsersList);
 ?>
  </td>

main/tracking/course_log_tools.php

Spacing +5 added lines, -5 removed lines

@@ -65,8 +65,8 @@ 
 
 // Breadcrumbs.
 if (isset($_GET['origin']) && $_GET['origin'] == 'resume_session') {
-    $interbreadcrumb[] = array('url' => '../admin/index.php','name' => get_lang('PlatformAdmin'));
-    $interbreadcrumb[] = array('url' => '../session/session_list.php','name' => get_lang('SessionList'));
+    $interbreadcrumb[] = array('url' => '../admin/index.php', 'name' => get_lang('PlatformAdmin'));
+    $interbreadcrumb[] = array('url' => '../session/session_list.php', 'name' => get_lang('SessionList'));
     $interbreadcrumb[] = array('url' => '../session/resume_session.php?id_session='.api_get_session_id(), 'name' => get_lang('SessionOverview'));
 }
 
@@ -134,10 +134,10 @@ 
 
 echo '<span style="float:right; padding-top:0px;">';
 echo '<a href="javascript: void(0);" onclick="javascript: window.print();">'.
-    Display::return_icon('printer.png', get_lang('Print'),'',ICON_SIZE_MEDIUM).'</a>';
+    Display::return_icon('printer.png', get_lang('Print'), '', ICON_SIZE_MEDIUM).'</a>';
 
 echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&id_session='.api_get_session_id().'&export=csv">
-	'.Display::return_icon('export_csv.png', get_lang('ExportAsCSV'),'',ICON_SIZE_MEDIUM).'</a>';
+	'.Display::return_icon('export_csv.png', get_lang('ExportAsCSV'), '', ICON_SIZE_MEDIUM).'</a>';
 
 echo '</span>';
 echo '</div>';
@@ -250,7 +250,7 @@ 
             $quiz_avg_score = round(($quiz_avg_score / $studentCount), 2).'%';
             $url = api_get_path(
                     WEB_CODE_PATH
-                ) . 'exercise/overview.php?exerciseId='.$quiz['id'].$course_path_params;
+                ).'exercise/overview.php?exerciseId='.$quiz['id'].$course_path_params;
 
             echo '<tr><td>'.Display::url(
                     $quiz['title'],

main/exercise/live_stats.php

Spacing +4 added lines, -4 removed lines

@@ -41,7 +41,7 @@ 
 $url = api_get_path(WEB_AJAX_PATH).'exercise.ajax.php?a=get_live_stats&exercise_id='.$objExercise->id.'&minutes='.$minutes;
 
 //The order is important you need to check the the $column variable in the model.ajax.php file
-$columns        = array(get_lang('FirstName'), get_lang('LastName'), get_lang('Time'), get_lang('QuestionsAlreadyAnswered'), get_lang('Score'));
+$columns = array(get_lang('FirstName'), get_lang('LastName'), get_lang('Time'), get_lang('QuestionsAlreadyAnswered'), get_lang('Score'));
 
 //Column config
 $column_model = array(
@@ -93,15 +93,15 @@ 
 
 $(function() {
     <?php
-        echo Display::grid_js('live_stats',  $url, $columns, $column_model, $extra_params, array(), null, true);
+        echo Display::grid_js('live_stats', $url, $columns, $column_model, $extra_params, array(), null, true);
     ?>
     refreshGrid();
 });
 </script>
 <?php
 
-$actions = '<a href="exercise_report.php?exerciseId='.intval($_GET['exerciseId']).'&'.api_get_cidreq().'">' .
-    Display :: return_icon('back.png', get_lang('GoBackToQuestionList'),'',ICON_SIZE_MEDIUM).'</a>';
+$actions = '<a href="exercise_report.php?exerciseId='.intval($_GET['exerciseId']).'&'.api_get_cidreq().'">'.
+    Display :: return_icon('back.png', get_lang('GoBackToQuestionList'), '', ICON_SIZE_MEDIUM).'</a>';
 echo $actions = Display::div($actions, array('class'=> 'actions'));
 
 echo Display::grid_html('live_stats');

main/exercise/multiple_answer_combination.class.php

Spacing +19 added lines, -19 removed lines

@@ -39,10 +39,10 @@ 
         $html = '<table class="table table-striped table-hover">';
         $html .= '<thead>';
         $html .= '<tr>';
-        $html .= '<th width="10">' . get_lang('Number') . '</th>';
-        $html .= '<th width="10">' . get_lang('True') . '</th>';
-        $html .= '<th width="50%">' . get_lang('Comment') . '</th>';
-        $html .= '<th width="50%">' . get_lang('Answer') . '</th>';
+        $html .= '<th width="10">'.get_lang('Number').'</th>';
+        $html .= '<th width="10">'.get_lang('True').'</th>';
+        $html .= '<th width="50%">'.get_lang('Comment').'</th>';
+        $html .= '<th width="50%">'.get_lang('Answer').'</th>';
         $html .= '</tr>';
         $html .= '</thead>';
         $html .= '<tbody>';
@@ -74,10 +74,10 @@ 
             $form->addHtml('<tr>');
 
             if (is_object($answer)) {
-                $defaults['answer[' . $i . ']'] = $answer->answer[$i];
-                $defaults['comment[' . $i . ']'] = $answer->comment[$i];
-                $defaults['weighting[' . $i . ']'] = float_format($answer->weighting[$i], 1);
-                $defaults['correct[' . $i . ']'] = $answer->correct[$i];
+                $defaults['answer['.$i.']'] = $answer->answer[$i];
+                $defaults['comment['.$i.']'] = $answer->comment[$i];
+                $defaults['weighting['.$i.']'] = float_format($answer->weighting[$i], 1);
+                $defaults['correct['.$i.']'] = $answer->correct[$i];
             } else {
                 $defaults['answer[1]'] = get_lang('DefaultMultipleAnswer2');
                 $defaults['comment[1]'] = get_lang('DefaultMultipleComment2');
@@ -93,44 +93,44 @@ 
 
             $renderer->setElementTemplate(
                 '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>',
-                'correct[' . $i . ']'
+                'correct['.$i.']'
             );
             $renderer->setElementTemplate(
                 '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>',
-                'counter[' . $i . ']'
+                'counter['.$i.']'
             );
             $renderer->setElementTemplate(
                 '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>',
-                'answer[' . $i . ']'
+                'answer['.$i.']'
             );
             $renderer->setElementTemplate(
                 '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>',
-                'comment[' . $i . ']'
+                'comment['.$i.']'
             );
 
-            $answer_number = $form->addElement('text', 'counter[' . $i . ']', null, 'value="' . $i . '"');
+            $answer_number = $form->addElement('text', 'counter['.$i.']', null, 'value="'.$i.'"');
             $answer_number->freeze();
 
             $form->addElement('checkbox',
-                'correct[' . $i . ']',
+                'correct['.$i.']',
                 null,
                 null,
                 'class="checkbox" style="margin-left: 0em;"'
             );
-            $boxes_names[] = 'correct[' . $i . ']';
+            $boxes_names[] = 'correct['.$i.']';
 
             $form->addElement(
                 'html_editor',
-                'answer[' . $i . ']',
+                'answer['.$i.']',
                 null,
                 array(),
                 array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '100')
             );
-            $form->addRule('answer[' . $i . ']', get_lang('ThisFieldIsRequired'), 'required');
+            $form->addRule('answer['.$i.']', get_lang('ThisFieldIsRequired'), 'required');
 
             $form->addElement(
                 'html_editor',
-                'comment[' . $i . ']',
+                'comment['.$i.']',
                 null,
                 array(),
                 array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '100')
@@ -226,7 +226,7 @@ 
     function return_header($feedback_type = null, $counter = null, $score = null)
     {
         $header = parent::return_header($feedback_type, $counter, $score);
-        $header .= '<table class="'.$this->question_table_class .'">
+        $header .= '<table class="'.$this->question_table_class.'">
             <tr>
                 <th>'.get_lang("Choice").'</th>
                 <th>'. get_lang("ExpectedChoice").'</th>