chamilo / chamilo-lms

main/timeline/view.php

Spacing +3 added lines, -3 removed lines

@@ -6,8 +6,8 @@ 
 */
 require_once '../inc/global.inc.php';
 
-$interbreadcrumb[]=array('url' => 'index.php','name' => get_lang('Timeline'));
-$interbreadcrumb[]=array('url' => 'index.php','name' => get_lang('Listing'));
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('Timeline'));
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('Listing'));
 
 $timeline = new Timeline();
 if (empty($_GET['id'])) {
@@ -15,7 +15,7 @@ 
 }
 $url = $timeline->get_url($_GET['id']);
 $item = $timeline->get($_GET['id']);
-$interbreadcrumb[]=array('url' => '#','name' => $item['headline']);
+$interbreadcrumb[] = array('url' => '#', 'name' => $item['headline']);
 
 $htmlHeadXtra[] = api_get_css(api_get_path(WEB_LIBRARY_PATH).'javascript/timeline/timeline.css');
 $htmlHeadXtra[] = api_get_js('timeline/timeline-min.js');

main/blog/download.php

Spacing +4 added lines, -4 removed lines

@@ -15,7 +15,7 @@ 
 session_cache_limiter('public');
 
 require_once '../inc/global.inc.php';
-$this_section=SECTION_COURSES;
+$this_section = SECTION_COURSES;
 
 // IMPORTANT to avoid caching of documents
 header('Expires: Wed, 01 Jan 1990 00:00:00 GMT');
@@ -32,7 +32,7 @@ 
 $doc_url = str_replace(' ', '+', $doc_url);
 $doc_url = str_replace('/..', '', $doc_url); //echo $doc_url;
 
-if (! isset($_course)) {
+if (!isset($_course)) {
 	api_not_allowed(true);
 }
 $full_file_name = api_get_path(SYS_COURSE_PATH).api_get_course_path().'/upload/blog/'.$doc_url;
@@ -40,7 +40,7 @@ 
 //if the rewrite rule asks for a directory, we redirect to the course view
 if (is_dir($full_file_name)) {
 	//remove last slash if present
-	while ($doc_url{$dul = strlen($doc_url)-1}=='/') $doc_url = substr($doc_url,0,$dul);
+	while ($doc_url{$dul = strlen($doc_url) - 1} == '/') $doc_url = substr($doc_url, 0, $dul);
 	//create the path
 	$document_explorer = api_get_path(WEB_COURSE_PATH).api_get_course_path(); // home course path
 	//redirect
@@ -48,7 +48,7 @@ 
     exit;
 }
 
-$tbl_blogs_attachment 	= Database::get_course_table(TABLE_BLOGS_ATTACHMENT);
+$tbl_blogs_attachment = Database::get_course_table(TABLE_BLOGS_ATTACHMENT);
 $course_id = api_get_course_int_id();
 
 // launch event

main/blog/blog.php

Spacing +25 added lines, -25 removed lines

@@ -13,15 +13,15 @@ 
     api_not_allowed(true);
 }
 
-$this_section   = SECTION_COURSES;
-$current_course_tool  = TOOL_BLOGS;
+$this_section = SECTION_COURSES;
+$current_course_tool = TOOL_BLOGS;
 
 /* 	ACCESS RIGHTS */
 // notice for unauthorized people.
 api_protect_course_script(true);
 
 $lib_path = api_get_path(LIBRARY_PATH);
-$blog_table_attachment 	= Database::get_course_table(TABLE_BLOGS_ATTACHMENT);
+$blog_table_attachment = Database::get_course_table(TABLE_BLOGS_ATTACHMENT);
 
 $nameTools  = get_lang('Blogs');
 $DaysShort  = api_get_week_days_short();
@@ -135,7 +135,7 @@ 
 		$safe_comment_title,
 		$safe_comment_text,
 		$blog_id,
-		(int)$_GET['post_id'],
+		(int) $_GET['post_id'],
 		$_POST['comment_parent_id'],
 		$_POST['task_id']
 	);
@@ -147,29 +147,29 @@ 
 if (!empty($_POST['register'])) {
 	if (is_array($_POST['user'])) {
 		foreach ($_POST['user'] as $index => $user_id) {
-			Blog :: set_user_subscribed((int)$_GET['blog_id'], $user_id);
+			Blog :: set_user_subscribed((int) $_GET['blog_id'], $user_id);
 		}
 	}
 }
 if (!empty($_POST['unregister'])) {
 	if (is_array($_POST['user'])) {
 		foreach ($_POST['user'] as $index => $user_id) {
-			Blog :: set_user_unsubscribed((int)$_GET['blog_id'], $user_id);
+			Blog :: set_user_unsubscribed((int) $_GET['blog_id'], $user_id);
 		}
 	}
 }
 if (!empty($_GET['register'])) {
-	Blog :: set_user_subscribed((int)$_GET['blog_id'], (int)$_GET['user_id']);
+	Blog :: set_user_subscribed((int) $_GET['blog_id'], (int) $_GET['user_id']);
 	$return_message = array('type' => 'confirmation', 'message' => get_lang('UserRegistered'));
 	$flag = 1;
 }
 if (!empty($_GET['unregister'])) {
-	Blog :: set_user_unsubscribed((int)$_GET['blog_id'], (int)$_GET['user_id']);
+	Blog :: set_user_unsubscribed((int) $_GET['blog_id'], (int) $_GET['user_id']);
 }
 
 if (isset($_GET['action']) && $_GET['action'] == 'manage_tasks') {
 	if (isset($_GET['do']) && $_GET['do'] == 'delete') {
-		Blog :: delete_task($blog_id, (int)$_GET['task_id']);
+		Blog :: delete_task($blog_id, (int) $_GET['task_id']);
 		$return_message = array('type' => 'confirmation', 'message' => get_lang('TaskDeleted'));
 	}
 
@@ -182,9 +182,9 @@ 
 if (isset($_GET['action']) && $_GET['action'] == 'view_post') {
 	$task_id = (isset ($_GET['task_id']) && is_numeric($_GET['task_id'])) ? $_GET['task_id'] : 0;
 
-	if (isset($_GET['do']) && $_GET['do'] == 'delete_comment')	{
+	if (isset($_GET['do']) && $_GET['do'] == 'delete_comment') {
 		if (api_is_allowed('BLOG_'.$blog_id, 'article_comments_delete', $task_id)) {
-			Blog :: delete_comment($blog_id, (int)$_GET['post_id'],(int)$_GET['comment_id']);
+			Blog :: delete_comment($blog_id, (int) $_GET['post_id'], (int) $_GET['comment_id']);
 			$return_message = array('type' => 'confirmation', 'message' => get_lang('CommentDeleted'));
 		} else {
 			$error = true;
@@ -192,9 +192,9 @@ 
 		}
 	}
 
-	if (isset($_GET['do']) && $_GET['do'] == 'delete_article')	{
+	if (isset($_GET['do']) && $_GET['do'] == 'delete_article') {
 		if (api_is_allowed('BLOG_'.$blog_id, 'article_delete', $task_id)) {
-			Blog :: delete_post($blog_id, (int)$_GET['article_id']);
+			Blog :: delete_post($blog_id, (int) $_GET['article_id']);
 			$action = ''; // Article is gone, go to blog home
 			$return_message = array('type' => 'confirmation', 'message' => get_lang('BlogDeleted'));
 		} else {
@@ -205,13 +205,13 @@ 
 	if (isset($_GET['do']) && $_GET['do'] == 'rate') {
 		if (isset($_GET['type']) && $_GET['type'] == 'post') {
 			if (api_is_allowed('BLOG_'.$blog_id, 'article_rate')) {
-				Blog :: add_rating('post', $blog_id, (int)$_GET['post_id'], (int)$_GET['rating']);
+				Blog :: add_rating('post', $blog_id, (int) $_GET['post_id'], (int) $_GET['rating']);
 				$return_message = array('type' => 'confirmation', 'message' => get_lang('RatingAdded'));
 			}
 		}
 		if (isset($_GET['type']) && $_GET['type'] == 'comment') {
 			if (api_is_allowed('BLOG_'.$blog_id, 'article_comments_add')) {
-				Blog :: add_rating('comment', $blog_id, (int)$_GET['comment_id'], (int)$_GET['rating']);
+				Blog :: add_rating('comment', $blog_id, (int) $_GET['comment_id'], (int) $_GET['rating']);
 				$return_message = array('type' => 'confirmation', 'message' => get_lang('RatingAdded'));
 			}
 		}
@@ -290,16 +290,16 @@ 
 echo '<div class=actions>';
 ?>
 	<a href="<?php echo api_get_self(); ?>?blog_id=<?php echo $blog_id ?>&<?php echo api_get_cidreq(); ?>" title="<?php echo get_lang('Home') ?>">
-    <?php echo Display::return_icon('blog.png', get_lang('Home'),'',ICON_SIZE_MEDIUM); ?></a>
-	<?php if(api_is_allowed('BLOG_'.$blog_id, 'article_add')) { ?>
+    <?php echo Display::return_icon('blog.png', get_lang('Home'), '', ICON_SIZE_MEDIUM); ?></a>
+	<?php if (api_is_allowed('BLOG_'.$blog_id, 'article_add')) { ?>
     <a href="<?php echo api_get_self(); ?>?action=new_post&amp;blog_id=<?php echo $blog_id ?>" title="<?php echo get_lang('NewPost') ?>">
-    <?php echo Display::return_icon('new_article.png', get_lang('NewPost'),'',ICON_SIZE_MEDIUM); ?></a><?php } ?>
-	<?php if(api_is_allowed('BLOG_'.$blog_id, 'task_management')) { ?>
+    <?php echo Display::return_icon('new_article.png', get_lang('NewPost'), '', ICON_SIZE_MEDIUM); ?></a><?php } ?>
+	<?php if (api_is_allowed('BLOG_'.$blog_id, 'task_management')) { ?>
     <a href="<?php echo api_get_self(); ?>?action=manage_tasks&amp;blog_id=<?php echo $blog_id ?>" title="<?php echo get_lang('ManageTasks') ?>">
-    <?php echo Display::return_icon('blog_tasks.png', get_lang('TaskManager'),'',ICON_SIZE_MEDIUM); ?></a><?php } ?>
-	<?php if(api_is_allowed('BLOG_'.$blog_id, 'member_management')) { ?>
+    <?php echo Display::return_icon('blog_tasks.png', get_lang('TaskManager'), '', ICON_SIZE_MEDIUM); ?></a><?php } ?>
+	<?php if (api_is_allowed('BLOG_'.$blog_id, 'member_management')) { ?>
     <a href="<?php echo api_get_self(); ?>?action=manage_members&amp;blog_id=<?php echo $blog_id ?>" title="<?php echo get_lang('ManageMembers') ?>">
-    <?php echo Display::return_icon('blog_admin_users.png', get_lang('MemberManager'),'',ICON_SIZE_MEDIUM); ?></a><?php } ?>
+    <?php echo Display::return_icon('blog_admin_users.png', get_lang('MemberManager'), '', ICON_SIZE_MEDIUM); ?></a><?php } ?>
 <?php
 echo '</div>';
 
@@ -317,8 +317,8 @@ 
                 <div class="panel-heading"><?php echo get_lang('Calendar') ?></div>
                 <div class="panel-body">
                     <?php
-                        $month = isset($_GET['month']) ? (int)$_GET['month'] : (int) date('m');
-                        $year = isset($_GET['year']) ? (int)$_GET['year'] : date('Y');
+                        $month = isset($_GET['month']) ? (int) $_GET['month'] : (int) date('m');
+                        $year = isset($_GET['year']) ? (int) $_GET['year'] : date('Y');
                         Blog::display_minimonthcalendar($month, $year, $blog_id);
                     ?>
                 </div>
@@ -363,7 +363,7 @@ 
 $course_id = api_get_course_int_id();
 
 if (isset ($_GET['task_id']) && is_numeric($_GET['task_id'])) {
-	$task_id = (int)$_GET['task_id'];
+	$task_id = (int) $_GET['task_id'];
 } else {
 	$task_id = 0;
 	$tbl_blogs_tasks_rel_user = Database :: get_course_table(TABLE_BLOGS_TASKS_REL_USER);

main/exercice/oral_expression.class.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
     function createAnswersForm($form)
     {
 
-        $form -> addElement('text','weighting', get_lang('Weighting'), array('class' => 'span1'));
+        $form -> addElement('text', 'weighting', get_lang('Weighting'), array('class' => 'span1'));
         global $text, $class;
         // setting the save button here and not in the question class.php
         $form->addButtonSave($text, 'submitQuestion');

main/exercice/hotpotatoes_exercise_report.php

Spacing +18 added lines, -18 removed lines

@@ -73,10 +73,10 @@ 
 if ($is_allowedToEdit && $origin != 'learnpath') {
     // the form
     if (api_is_platform_admin() || api_is_course_admin() || api_is_course_tutor() || api_is_course_coach()) {
-        $actions .= '<a id="export_opener" href="'.api_get_self().'?export_report=1&path='.Security::remove_XSS($hotpotatoes_path).' ">'.Display::return_icon('save.png',   get_lang('Export'),'',ICON_SIZE_MEDIUM).'</a>';
+        $actions .= '<a id="export_opener" href="'.api_get_self().'?export_report=1&path='.Security::remove_XSS($hotpotatoes_path).' ">'.Display::return_icon('save.png', get_lang('Export'), '', ICON_SIZE_MEDIUM).'</a>';
     }
 } else {
-    $actions .= '<a href="exercise.php">' . Display :: return_icon('back.png', get_lang('GoBackToQuestionList'),'',ICON_SIZE_MEDIUM).'</a>';
+    $actions .= '<a href="exercise.php">'.Display :: return_icon('back.png', get_lang('GoBackToQuestionList'), '', ICON_SIZE_MEDIUM).'</a>';
 }
 
 if ($is_allowedToEdit) {
@@ -98,13 +98,13 @@ 
 
 if ($is_allowedToEdit || $is_tutor) {
     $nameTools = get_lang('StudentScore');
-    $interbreadcrumb[] = array("url" => "exercise.php","name" => get_lang('Exercises'));
+    $interbreadcrumb[] = array("url" => "exercise.php", "name" => get_lang('Exercises'));
     $objExerciseTmp = new Exercise();
     /*if ($objExerciseTmp->read($exercise_id)) {
         $interbreadcrumb[] = array("url" => "admin.php?exerciseId=".$exercise_id, "name" => $objExerciseTmp->name);
     }*/
 } else {
-    $interbreadcrumb[] = array("url" => "exercise.php","name" => get_lang('Exercises'));
+    $interbreadcrumb[] = array("url" => "exercise.php", "name" => get_lang('Exercises'));
     $objExerciseTmp = new Exercise();
     /*if ($objExerciseTmp->read($exercise_id)) {
         $nameTools = get_lang('Results').': '.$objExerciseTmp->name;
@@ -115,7 +115,7 @@ 
 
 $actions = Display::div($actions, array('class'=> 'actions'));
 
-$extra =  '<script type="text/javascript">
+$extra = '<script type="text/javascript">
     $(document).ready(function() {
 
         $( "#dialog:ui-dialog" ).dialog( "destroy" );
@@ -169,7 +169,7 @@ 
 // Generating group list
 
 $group_list = GroupManager::get_group_list();
-$group_parameters = array('group_all:'.get_lang('All'),'group_none:'.get_lang('None'));
+$group_parameters = array('group_all:'.get_lang('All'), 'group_none:'.get_lang('None'));
 
 foreach ($group_list as $group) {
     $group_parameters[] = $group['id'].':'.$group['name'];
@@ -192,14 +192,14 @@ 
 
   // Column config
   // @todo fix search firstname/lastname that doesn't work. rmove search for the moment
-	$column_model   = array(
-        array('name'=>'firstname',      'index'=>'firstname',		'width'=>'50',   'align'=>'left', 'search' => 'false'),
-        array('name'=>'lastname',		    'index'=>'lastname',		'width'=>'50',   'align'=>'left', 'formatter'=>'action_formatter', 'search' => 'false'),
-        array('name'=>'login',          'hidden'=>'true',       'index'=>'username',        'width'=>'40',   'align'=>'left', 'search' => 'false'),
-        array('name'=>'group_name',		  'index'=>'group_id',    'width'=>'40',   'align'=>'left', 'search' => 'false'),
-        array('name'=>'exe_date',		    'index'=>'exe_date',		'width'=>'60',   'align'=>'left', 'search' => 'false'),
-        array('name'=>'score',			    'index'=>'exe_result',	'width'=>'50',   'align'=>'left', 'search' => 'false'),
-        array('name'=>'actions',        'index'=>'actions',     'width'=>'60',  'align'=>'left', 'search' => 'false')
+	$column_model = array(
+        array('name'=>'firstname', 'index'=>'firstname', 'width'=>'50', 'align'=>'left', 'search' => 'false'),
+        array('name'=>'lastname', 'index'=>'lastname', 'width'=>'50', 'align'=>'left', 'formatter'=>'action_formatter', 'search' => 'false'),
+        array('name'=>'login', 'hidden'=>'true', 'index'=>'username', 'width'=>'40', 'align'=>'left', 'search' => 'false'),
+        array('name'=>'group_name', 'index'=>'group_id', 'width'=>'40', 'align'=>'left', 'search' => 'false'),
+        array('name'=>'exe_date', 'index'=>'exe_date', 'width'=>'60', 'align'=>'left', 'search' => 'false'),
+        array('name'=>'score', 'index'=>'exe_result', 'width'=>'50', 'align'=>'left', 'search' => 'false'),
+        array('name'=>'actions', 'index'=>'actions', 'width'=>'60', 'align'=>'left', 'search' => 'false')
     );
 
     $action_links = '
@@ -222,10 +222,10 @@ 
 
     //Column config
     // @todo fix search firstname/lastname that doesn't work. rmove search for the moment
-    $column_model  = array(
-        array('name'=>'exe_date',		    'index'=>'exe_date',		'width'=>'60',   'align'=>'left', 'search' => 'false'),
-        array('name'=>'score',			    'index'=>'exe_result',	'width'=>'50',   'align'=>'left', 'search' => 'false'),
-        array('name'=>'actions',        'index'=>'actions',     'width'=>'60',  'align'=>'left', 'search' => 'false')
+    $column_model = array(
+        array('name'=>'exe_date', 'index'=>'exe_date', 'width'=>'60', 'align'=>'left', 'search' => 'false'),
+        array('name'=>'score', 'index'=>'exe_result', 'width'=>'50', 'align'=>'left', 'search' => 'false'),
+        array('name'=>'actions', 'index'=>'actions', 'width'=>'60', 'align'=>'left', 'search' => 'false')
     );
 }
 

main/exercice/hotspot.inc.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 $file = file(api_get_path(SYS_LANG_PATH).'english/hotspot.inc.php');
 
 foreach ($file as &$value) {
-	$variable = explode('=', $value , 2);
+	$variable = explode('=', $value, 2);
 	if (count($variable) > 1) {
 		$variable = substr(trim($variable[0]), 1);
 		$variable = '&'.$variable.'='.api_utf8_encode(get_lang($variable)).' ';

main/exercice/tests_category.php

Spacing +8 added lines, -8 removed lines

@@ -147,7 +147,7 @@ 
 function add_category_form($action) {
     $action = Security::remove_XSS($action);
     // initiate the object
-    $form = new FormValidator('note', 'post', api_get_self() . '?action=' . $action);
+    $form = new FormValidator('note', 'post', api_get_self().'?action='.$action);
     // Setting the form elements
     $form->addElement('header', get_lang('AddACategory'));
     $form->addElement('text', 'category_name', get_lang('CategoryName'), array('size' => '95'));
@@ -189,19 +189,19 @@ 
 
 function display_add_category() {
     echo '<div class="actions">';
-    echo '<a href="exercise.php?' . api_get_cidreq() . '">' .
-            Display::return_icon('back.png', get_lang('GoBackToQuestionList'), '', ICON_SIZE_MEDIUM) . '</a>';
-    echo '<a href="' . api_get_self() . '?action=addcategory">' .
-        Display::return_icon('question_category.gif', get_lang('AddACategory')) . '</a>';
+    echo '<a href="exercise.php?'.api_get_cidreq().'">'.
+            Display::return_icon('back.png', get_lang('GoBackToQuestionList'), '', ICON_SIZE_MEDIUM).'</a>';
+    echo '<a href="'.api_get_self().'?action=addcategory">'.
+        Display::return_icon('question_category.gif', get_lang('AddACategory')).'</a>';
     echo '</div>';
     echo "<br/>";
-    echo "<fieldset><legend>" . get_lang('QuestionCategory') . "</legend></fieldset>";
+    echo "<fieldset><legend>".get_lang('QuestionCategory')."</legend></fieldset>";
 }
 
 // display goback to category list page link
 function display_goback() {
     echo '<div class="actions">';
-    echo '<a href="' . api_get_self() . '">' .
-        Display::return_icon('back.png', get_lang('BackToCategoryList'), array(), 32) . '</a>';
+    echo '<a href="'.api_get_self().'">'.
+        Display::return_icon('back.png', get_lang('BackToCategoryList'), array(), 32).'</a>';
     echo '</div>';
 }

main/exercice/overview.php

Spacing +10 added lines, -10 removed lines

@@ -12,7 +12,7 @@ 
 
 require_once '../inc/global.inc.php';
 
-$current_course_tool  = TOOL_QUIZ;
+$current_course_tool = TOOL_QUIZ;
 
 // Clear the exercise session just in case
 if (isset($_SESSION['objExercise'])) {
@@ -49,7 +49,7 @@ 
 
 if ($time_control) {
     // Get time left for expiring time
-    $time_left = api_strtotime($clock_expired_time,'UTC') - time();
+    $time_left = api_strtotime($clock_expired_time, 'UTC') - time();
 
     $htmlHeadXtra[] = api_get_css(api_get_path(WEB_LIBRARY_PATH).'javascript/epiclock/stylesheet/jquery.epiclock.css');
     $htmlHeadXtra[] = api_get_css(api_get_path(WEB_LIBRARY_PATH).'javascript/epiclock/renderers/minute/epiclock.minute.css');
@@ -72,7 +72,7 @@ 
 
 $html = '';
 $message = '';
-$html.= '<div class="exercise">';
+$html .= '<div class="exercise">';
 $is_allowed_to_edit = api_is_allowed_to_edit(null, true);
 $edit_link = '';
 if ($is_allowed_to_edit && $objExercise->sessionId == $sessionId) {
@@ -177,8 +177,8 @@ 
             $attempt_result['exe_result'],
             $attempt_result['exe_weighting']
         );
-        $attempt_url = api_get_path(WEB_CODE_PATH) . 'exercice/result.php?';
-        $attempt_url .= api_get_cidreq() . '&show_headers=1&';
+        $attempt_url = api_get_path(WEB_CODE_PATH).'exercice/result.php?';
+        $attempt_url .= api_get_cidreq().'&show_headers=1&';
         $attempt_url .= http_build_query([
             'id' => $attempt_result['exe_id']
         ]);
@@ -188,7 +188,7 @@ 
             get_lang('Show'),
             $attempt_url,
             [
-                'class' => $btn_class . 'btn btn-default',
+                'class' => $btn_class.'btn btn-default',
                 'data-title' => get_lang('Show'),
                 'data-size' => 'lg'
             ]
@@ -206,7 +206,7 @@ 
             ),
             'userIp' => $attempt_result['user_ip']
         );
-        $attempt_link .= "&nbsp;&nbsp;&nbsp;" . $teacher_revised;
+        $attempt_link .= "&nbsp;&nbsp;&nbsp;".$teacher_revised;
 
         if (in_array(
             $objExercise->results_disabled,
@@ -283,12 +283,12 @@ 
         $attempt_message = Display::return_message($attempt_message, 'info');
     }
     if ($visible_return['value'] == true) {
-        $message .=   $attempt_message;
+        $message .= $attempt_message;
     }
 }
 
 if ($time_control) {
-    $html.= $objExercise->return_time_left_div();
+    $html .= $objExercise->return_time_left_div();
 }
 
 $html .= $message;
@@ -308,7 +308,7 @@ 
     $table_content,
     ['class' => 'table-responsive']
 );
-$html.= '</div>';
+$html .= '</div>';
 echo $html;
 
 Display::display_footer();

main/exercice/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>