chamilo / chamilo-lms

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

Braces +11 added lines, -9 removed lines

@@ -379,9 +379,10 @@ 
 	$result = Database::query($sql);
 	$row = Database::fetch_array($result);
 
-	if ($row['number'] == 1)
-		$user_task = true;
-}
+	if ($row['number'] == 1) {
+			$user_task = true;
+	}
+	}
 
 switch ($action) {
 	case 'new_post':
@@ -468,16 +469,17 @@ 
 			echo '<br /><br />';
 			Blog :: display_assigned_task_list($blog_id);
 			echo '<br /><br />';
+		} else {
+					api_not_allowed();
 		}
-		else
-			api_not_allowed();
 
 		break;
 	case 'execute_task' :
-		if (isset ($_GET['post_id']))
-			Blog :: display_post($blog_id, intval($_GET['post_id']));
-		else
-			Blog :: display_select_task_post($blog_id, intval($_GET['task_id']));
+		if (isset ($_GET['post_id'])) {
+					Blog :: display_post($blog_id, intval($_GET['post_id']));
+		} else {
+					Blog :: display_select_task_post($blog_id, intval($_GET['task_id']));
+		}
 
 		break;
 	case 'view_search_result' :

Indentation +288 added lines, -288 removed lines

@@ -41,181 +41,181 @@ 
 $safe_task_description  = isset($_POST['task_description']) ? Security::remove_XSS($_POST['task_description']) : null;
 
 if (!empty($_POST['new_post_submit'])) {
-	Blog:: create_post(
-		$_POST['title'],
-		$_POST['full_text'],
-		$_POST['post_file_comment'],
-		$blog_id
-	);
-	$return_message = array('type' => 'confirmation', 'message' => get_lang('BlogAdded'));
+    Blog:: create_post(
+        $_POST['title'],
+        $_POST['full_text'],
+        $_POST['post_file_comment'],
+        $blog_id
+    );
+    $return_message = array('type' => 'confirmation', 'message' => get_lang('BlogAdded'));
 }
 if (!empty($_POST['edit_post_submit'])) {
-	Blog:: edit_post(
-		$_POST['post_id'],
-		$_POST['title'],
-		$_POST['full_text'],
-		$blog_id
-	);
-	$return_message = array('type' => 'confirmation', 'message' => get_lang('BlogEdited'));
+    Blog:: edit_post(
+        $_POST['post_id'],
+        $_POST['title'],
+        $_POST['full_text'],
+        $blog_id
+    );
+    $return_message = array('type' => 'confirmation', 'message' => get_lang('BlogEdited'));
 }
 
 if (!empty($_POST['new_comment_submit'])) {
-	Blog:: create_comment(
-		$_POST['title'],
-		$_POST['comment'],
-		$_POST['post_file_comment'],
-		$blog_id,
-		$_GET['post_id'],
-		$_POST['comment_parent_id']
-	);
-	$return_message = array('type' => 'confirmation', 'message' => get_lang('CommentAdded'));
+    Blog:: create_comment(
+        $_POST['title'],
+        $_POST['comment'],
+        $_POST['post_file_comment'],
+        $blog_id,
+        $_GET['post_id'],
+        $_POST['comment_parent_id']
+    );
+    $return_message = array('type' => 'confirmation', 'message' => get_lang('CommentAdded'));
 }
 
 if (!empty($_POST['new_task_submit'])) {
 
-	Blog:: create_task(
-		$blog_id,
-		$safe_task_name,
-		$safe_task_description,
-		(isset($_POST['chkArticleDelete']) ? $_POST['chkArticleDelete'] : null),
-		(isset($_POST['chkArticleEdit']) ? $_POST['chkArticleEdit'] : null),
-		(isset($_POST['chkCommentsDelete']) ? $_POST['chkCommentsDelete'] : null),
-		(isset($_POST['task_color']) ? $_POST['task_color'] : null)
-	);
-	$return_message = array('type' => 'confirmation', 'message' => get_lang('TaskCreated'));
+    Blog:: create_task(
+        $blog_id,
+        $safe_task_name,
+        $safe_task_description,
+        (isset($_POST['chkArticleDelete']) ? $_POST['chkArticleDelete'] : null),
+        (isset($_POST['chkArticleEdit']) ? $_POST['chkArticleEdit'] : null),
+        (isset($_POST['chkCommentsDelete']) ? $_POST['chkCommentsDelete'] : null),
+        (isset($_POST['task_color']) ? $_POST['task_color'] : null)
+    );
+    $return_message = array('type' => 'confirmation', 'message' => get_lang('TaskCreated'));
 }
 
 if (isset($_POST['edit_task_submit'])) {
-	Blog:: edit_task(
-		$_POST['blog_id'],
-		$_POST['task_id'],
-		$safe_task_name,
-		$safe_task_description,
-		$_POST['chkArticleDelete'],
-		$_POST['chkArticleEdit'],
-		$_POST['chkCommentsDelete'],
-		$_POST['task_color']
-	);
-	$return_message = array(
-		'type' => 'confirmation',
-		'message' => get_lang('TaskEdited')
-	);
+    Blog:: edit_task(
+        $_POST['blog_id'],
+        $_POST['task_id'],
+        $safe_task_name,
+        $safe_task_description,
+        $_POST['chkArticleDelete'],
+        $_POST['chkArticleEdit'],
+        $_POST['chkCommentsDelete'],
+        $_POST['task_color']
+    );
+    $return_message = array(
+        'type' => 'confirmation',
+        'message' => get_lang('TaskEdited')
+    );
 }
 
 if (!empty($_POST['assign_task_submit'])) {
-	Blog:: assign_task(
-		$blog_id,
-		$_POST['task_user_id'],
-		$_POST['task_task_id'],
-		$_POST['task_day']
-	);
-	$return_message = array(
-		'type' => 'confirmation',
-		'message' => get_lang('TaskAssigned')
-	);
+    Blog:: assign_task(
+        $blog_id,
+        $_POST['task_user_id'],
+        $_POST['task_task_id'],
+        $_POST['task_day']
+    );
+    $return_message = array(
+        'type' => 'confirmation',
+        'message' => get_lang('TaskAssigned')
+    );
 }
 
 if (isset($_POST['assign_task_edit_submit'])) {
-	Blog:: edit_assigned_task(
-		$blog_id,
-		$_POST['task_user_id'],
-		$_POST['task_task_id'],
-		$_POST['task_day'],
-		$_POST['old_user_id'],
-		$_POST['old_task_id'],
-		$_POST['old_target_date']
-	);
-	$return_message = array(
-		'type' => 'confirmation',
-		'message' => get_lang('AssignedTaskEdited')
-	);
+    Blog:: edit_assigned_task(
+        $blog_id,
+        $_POST['task_user_id'],
+        $_POST['task_task_id'],
+        $_POST['task_day'],
+        $_POST['old_user_id'],
+        $_POST['old_task_id'],
+        $_POST['old_target_date']
+    );
+    $return_message = array(
+        'type' => 'confirmation',
+        'message' => get_lang('AssignedTaskEdited')
+    );
 }
 if (!empty($_POST['new_task_execution_submit'])) {
-	Blog:: create_comment(
-		$safe_comment_title,
-		$safe_comment_text,
-		$blog_id,
-		(int)$_GET['post_id'],
-		$_POST['comment_parent_id'],
-		$_POST['task_id']
-	);
-	$return_message = array(
-		'type' => 'confirmation',
-		'message' => get_lang('CommentCreated')
-	);
+    Blog:: create_comment(
+        $safe_comment_title,
+        $safe_comment_text,
+        $blog_id,
+        (int)$_GET['post_id'],
+        $_POST['comment_parent_id'],
+        $_POST['task_id']
+    );
+    $return_message = array(
+        'type' => 'confirmation',
+        'message' => get_lang('CommentCreated')
+    );
 }
 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);
-		}
-	}
+    if (is_array($_POST['user'])) {
+        foreach ($_POST['user'] as $index => $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);
-		}
-	}
+    if (is_array($_POST['user'])) {
+        foreach ($_POST['user'] as $index => $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']);
-	$return_message = array('type' => 'confirmation', 'message' => get_lang('UserRegistered'));
-	$flag = 1;
+    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']);
-		$return_message = array('type' => 'confirmation', 'message' => get_lang('TaskDeleted'));
-	}
-
-	if (isset($_GET['do']) && $_GET['do'] == 'delete_assignment') {
-		Blog :: delete_assigned_task($blog_id, intval($_GET['task_id']), intval($_GET['user_id']));
-		$return_message = array('type' => 'confirmation', 'message' => get_lang('TaskAssignmentDeleted'));
-	}
+    if (isset($_GET['do']) && $_GET['do'] == 'delete') {
+        Blog :: delete_task($blog_id, (int)$_GET['task_id']);
+        $return_message = array('type' => 'confirmation', 'message' => get_lang('TaskDeleted'));
+    }
+
+    if (isset($_GET['do']) && $_GET['do'] == 'delete_assignment') {
+        Blog :: delete_assigned_task($blog_id, intval($_GET['task_id']), intval($_GET['user_id']));
+        $return_message = array('type' => 'confirmation', 'message' => get_lang('TaskAssignmentDeleted'));
+    }
 }
 
 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 (api_is_allowed('BLOG_'.$blog_id, 'article_comments_delete', $task_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;
-			$message = get_lang('ActionNotAllowed');
-		}
-	}
-
-	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']);
-			$action = ''; // Article is gone, go to blog home
-			$return_message = array('type' => 'confirmation', 'message' => get_lang('BlogDeleted'));
-		} else {
-			$error = true;
-			$message = get_lang('ActionNotAllowed');
-		}
-	}
-	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']);
-				$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']);
-				$return_message = array('type' => 'confirmation', 'message' => get_lang('RatingAdded'));
-			}
-		}
-	}
+    $task_id = (isset ($_GET['task_id']) && is_numeric($_GET['task_id'])) ? $_GET['task_id'] : 0;
+
+    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']);
+            $return_message = array('type' => 'confirmation', 'message' => get_lang('CommentDeleted'));
+        } else {
+            $error = true;
+            $message = get_lang('ActionNotAllowed');
+        }
+    }
+
+    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']);
+            $action = ''; // Article is gone, go to blog home
+            $return_message = array('type' => 'confirmation', 'message' => get_lang('BlogDeleted'));
+        } else {
+            $error = true;
+            $message = get_lang('ActionNotAllowed');
+        }
+    }
+    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']);
+                $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']);
+                $return_message = array('type' => 'confirmation', 'message' => get_lang('RatingAdded'));
+            }
+        }
+    }
 }
 /*
 	DISPLAY
@@ -223,67 +223,67 @@ 
 
 // Set breadcrumb
 switch ($action) {
-	case 'new_post' :
-		$nameTools = get_lang('NewPost');
+    case 'new_post' :
+        $nameTools = get_lang('NewPost');
         $interbreadcrumb[] = array(
             'url' => "blog.php?blog_id=$blog_id&".api_get_cidreq(),
             "name" => Blog:: get_blog_title($blog_id),
         );
-		Display :: display_header($nameTools, 'Blogs');
-		break;
-	case 'manage_tasks' :
-		$nameTools = get_lang('TaskManager');
+        Display :: display_header($nameTools, 'Blogs');
+        break;
+    case 'manage_tasks' :
+        $nameTools = get_lang('TaskManager');
         $interbreadcrumb[] = array(
             'url' => "blog.php?blog_id=$blog_id&".api_get_cidreq(),
             "name" => Blog:: get_blog_title($blog_id),
         );
-		Display :: display_header($nameTools, 'Blogs');
-		break;
-	case 'manage_members' :
-		$nameTools = get_lang('MemberManager');
+        Display :: display_header($nameTools, 'Blogs');
+        break;
+    case 'manage_members' :
+        $nameTools = get_lang('MemberManager');
         $interbreadcrumb[] = array(
             'url' => "blog.php?blog_id=$blog_id&".api_get_cidreq(),
             "name" => Blog:: get_blog_title($blog_id),
         );
-		Display :: display_header($nameTools, 'Blogs');
-		break;
-	case 'manage_rights' :
-		$nameTools = get_lang('RightsManager');
+        Display :: display_header($nameTools, 'Blogs');
+        break;
+    case 'manage_rights' :
+        $nameTools = get_lang('RightsManager');
         $interbreadcrumb[] = array(
             'url' => "blog.php?blog_id=$blog_id&".api_get_cidreq(),
             'name' => Blog:: get_blog_title($blog_id),
         );
-		Display :: display_header($nameTools, 'Blogs');
-		break;
-	case 'view_search_result' :
-		$nameTools = get_lang('SearchResults');
+        Display :: display_header($nameTools, 'Blogs');
+        break;
+    case 'view_search_result' :
+        $nameTools = get_lang('SearchResults');
         $interbreadcrumb[] = array(
             'url' => "blog.php?blog_id=$blog_id&".api_get_cidreq(),
             'name' => Blog:: get_blog_title($blog_id),
         );
-		Display :: display_header($nameTools, 'Blogs');
-		break;
-	case 'execute_task' :
-		$nameTools = get_lang('ExecuteThisTask');
+        Display :: display_header($nameTools, 'Blogs');
+        break;
+    case 'execute_task' :
+        $nameTools = get_lang('ExecuteThisTask');
         $interbreadcrumb[] = array(
             'url' => "blog.php?blog_id=$blog_id&".api_get_cidreq(),
             'name' => Blog:: get_blog_title($blog_id),
         );
-		Display :: display_header($nameTools, 'Blogs');
-		break;
-	default :
-		$nameTools = Blog :: get_blog_title($blog_id);
-		Display :: display_header($nameTools, 'Blogs');
+        Display :: display_header($nameTools, 'Blogs');
+        break;
+    default :
+        $nameTools = Blog :: get_blog_title($blog_id);
+        Display :: display_header($nameTools, 'Blogs');
 }
 
 // feedback messages
 if (!empty($return_message)) {
-	if ($return_message['type'] == 'confirmation') {
-		Display::display_confirmation_message($return_message['message']);
-	}
-	if ($return_message['type'] == 'error') {
-		Display::display_error_message($return_message['message']);
-	}
+    if ($return_message['type'] == 'confirmation') {
+        Display::display_confirmation_message($return_message['message']);
+    }
+    if ($return_message['type'] == 'error') {
+        Display::display_error_message($return_message['message']);
+    }
 }
 
 // actions
@@ -350,12 +350,12 @@ 
 		<?php
 
 if (isset($error)) {
-	Display :: display_error_message($message);
+    Display :: display_error_message($message);
 }
 
 if (isset($flag) && $flag == '1') {
-	$action = "manage_tasks";
-	Blog :: display_assign_task_form($blog_id);
+    $action = "manage_tasks";
+    Blog :: display_assign_task_form($blog_id);
 }
 
 $user_task = false;
@@ -363,12 +363,12 @@ 
 $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);
+    $task_id = 0;
+    $tbl_blogs_tasks_rel_user = Database :: get_course_table(TABLE_BLOGS_TASKS_REL_USER);
 
-	$sql = "SELECT COUNT(*) as number
+    $sql = "SELECT COUNT(*) as number
 			FROM ".$tbl_blogs_tasks_rel_user."
 			WHERE
 			    c_id = $course_id AND
@@ -376,120 +376,120 @@ 
 				user_id = ".api_get_user_id()." AND
 				task_id = ".$task_id;
 
-	$result = Database::query($sql);
-	$row = Database::fetch_array($result);
+    $result = Database::query($sql);
+    $row = Database::fetch_array($result);
 
-	if ($row['number'] == 1)
-		$user_task = true;
+    if ($row['number'] == 1)
+        $user_task = true;
 }
 
 switch ($action) {
-	case 'new_post':
-		if (api_is_allowed('BLOG_'.$blog_id, 'article_add', $user_task ? $task_id : 0)) {
-			// we show the form if
-			// 1. no post data
-			// 2. there is post data and the required field is empty
-			if (!$_POST OR (!empty($_POST) AND empty($_POST['title']))) {
-				// if there is post data there is certainly an error in the form
-				if ($_POST) {
-					Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'));
-				}
-			Blog :: display_form_new_post($blog_id);
-		} else {
-				if (isset($_GET['filter']) && !empty($_GET['filter'])) {
-					Blog :: display_day_results($blog_id, Database::escape_string($_GET['filter']));
-				} else {
-					Blog :: display_blog_posts($blog_id);
-				}
-			}
-		} else {
-			api_not_allowed();
-		}
-		break;
-	case 'view_post' :
-		Blog :: display_post($blog_id, intval($_GET['post_id']));
-		break;
-	case 'edit_post' :
-		$task_id = (isset ($_GET['task_id']) && is_numeric($_GET['task_id'])) ? $_GET['task_id'] : 0;
-
-		if (api_is_allowed('BLOG_'.$blog_id, 'article_edit', $task_id)) {
-			// we show the form if
-			// 1. no post data
-			// 2. there is post data and the required field is empty
-			if (!$_POST OR (!empty($_POST) AND empty($_POST['post_title']))) {
-				// if there is post data there is certainly an error in the form
-				if ($_POST) {
-					Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'));
-				}
+    case 'new_post':
+        if (api_is_allowed('BLOG_'.$blog_id, 'article_add', $user_task ? $task_id : 0)) {
+            // we show the form if
+            // 1. no post data
+            // 2. there is post data and the required field is empty
+            if (!$_POST OR (!empty($_POST) AND empty($_POST['title']))) {
+                // if there is post data there is certainly an error in the form
+                if ($_POST) {
+                    Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'));
+                }
+            Blog :: display_form_new_post($blog_id);
+        } else {
+                if (isset($_GET['filter']) && !empty($_GET['filter'])) {
+                    Blog :: display_day_results($blog_id, Database::escape_string($_GET['filter']));
+                } else {
+                    Blog :: display_blog_posts($blog_id);
+                }
+            }
+        } else {
+            api_not_allowed();
+        }
+        break;
+    case 'view_post' :
+        Blog :: display_post($blog_id, intval($_GET['post_id']));
+        break;
+    case 'edit_post' :
+        $task_id = (isset ($_GET['task_id']) && is_numeric($_GET['task_id'])) ? $_GET['task_id'] : 0;
+
+        if (api_is_allowed('BLOG_'.$blog_id, 'article_edit', $task_id)) {
+            // we show the form if
+            // 1. no post data
+            // 2. there is post data and the required field is empty
+            if (!$_POST OR (!empty($_POST) AND empty($_POST['post_title']))) {
+                // if there is post data there is certainly an error in the form
+                if ($_POST) {
+                    Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'));
+                }
                 Blog :: display_form_edit_post($blog_id, intval($_GET['post_id']));
-			} else {
-				if (isset ($_GET['filter']) && !empty ($_GET['filter'])) {
-					Blog :: display_day_results($blog_id, Database::escape_string($_GET['filter']));
-				} else {
-					Blog :: display_blog_posts($blog_id);
-				}
-			}
-		} else {
-			api_not_allowed();
-		}
-
-		break;
-	case 'manage_members' :
-		if (api_is_allowed('BLOG_'.$blog_id, 'member_management')) {
-			Blog :: display_form_user_subscribe($blog_id);
-			echo '<br /><br />';
-			Blog :: display_form_user_unsubscribe($blog_id);
-		} else {
-			api_not_allowed();
+            } else {
+                if (isset ($_GET['filter']) && !empty ($_GET['filter'])) {
+                    Blog :: display_day_results($blog_id, Database::escape_string($_GET['filter']));
+                } else {
+                    Blog :: display_blog_posts($blog_id);
+                }
+            }
+        } else {
+            api_not_allowed();
+        }
+
+        break;
+    case 'manage_members' :
+        if (api_is_allowed('BLOG_'.$blog_id, 'member_management')) {
+            Blog :: display_form_user_subscribe($blog_id);
+            echo '<br /><br />';
+            Blog :: display_form_user_unsubscribe($blog_id);
+        } else {
+            api_not_allowed();
         }
 
-		break;
-	case 'manage_rights' :
-		Blog :: display_form_user_rights($blog_id);
-		break;
-	case 'manage_tasks' :
-		if (api_is_allowed('BLOG_'.$blog_id, 'task_management')) {
-			if (isset($_GET['do']) && $_GET['do'] == 'add') {
-				Blog:: display_new_task_form($blog_id);
-			}
-			if (isset($_GET['do']) && $_GET['do'] == 'assign') {
-				Blog:: display_assign_task_form($blog_id);
-			}
-			if (isset($_GET['do']) && $_GET['do'] == 'edit') {
-				Blog:: display_edit_task_form(
-					$blog_id,
-					intval($_GET['task_id'])
-				);
-			}
-			if (isset($_GET['do']) && $_GET['do'] == 'edit_assignment') {
-				Blog :: display_edit_assigned_task_form($blog_id, intval($_GET['task_id']), intval($_GET['user_id']));
-			}
-			Blog :: display_task_list($blog_id);
-			echo '<br /><br />';
-			Blog :: display_assigned_task_list($blog_id);
-			echo '<br /><br />';
-		}
-		else
-			api_not_allowed();
-
-		break;
-	case 'execute_task' :
-		if (isset ($_GET['post_id']))
-			Blog :: display_post($blog_id, intval($_GET['post_id']));
-		else
-			Blog :: display_select_task_post($blog_id, intval($_GET['task_id']));
-
-		break;
-	case 'view_search_result' :
-		Blog :: display_search_results($blog_id, Database::escape_string($_GET['q']));
-		break;
-	case '' :
-	default :
-		if (isset ($_GET['filter']) && !empty ($_GET['filter'])) {
-			Blog :: display_day_results($blog_id, Database::escape_string($_GET['filter']));
-		} else {
-			Blog :: display_blog_posts($blog_id);
-		}
+        break;
+    case 'manage_rights' :
+        Blog :: display_form_user_rights($blog_id);
+        break;
+    case 'manage_tasks' :
+        if (api_is_allowed('BLOG_'.$blog_id, 'task_management')) {
+            if (isset($_GET['do']) && $_GET['do'] == 'add') {
+                Blog:: display_new_task_form($blog_id);
+            }
+            if (isset($_GET['do']) && $_GET['do'] == 'assign') {
+                Blog:: display_assign_task_form($blog_id);
+            }
+            if (isset($_GET['do']) && $_GET['do'] == 'edit') {
+                Blog:: display_edit_task_form(
+                    $blog_id,
+                    intval($_GET['task_id'])
+                );
+            }
+            if (isset($_GET['do']) && $_GET['do'] == 'edit_assignment') {
+                Blog :: display_edit_assigned_task_form($blog_id, intval($_GET['task_id']), intval($_GET['user_id']));
+            }
+            Blog :: display_task_list($blog_id);
+            echo '<br /><br />';
+            Blog :: display_assigned_task_list($blog_id);
+            echo '<br /><br />';
+        }
+        else
+            api_not_allowed();
+
+        break;
+    case 'execute_task' :
+        if (isset ($_GET['post_id']))
+            Blog :: display_post($blog_id, intval($_GET['post_id']));
+        else
+            Blog :: display_select_task_post($blog_id, intval($_GET['task_id']));
+
+        break;
+    case 'view_search_result' :
+        Blog :: display_search_results($blog_id, Database::escape_string($_GET['q']));
+        break;
+    case '' :
+    default :
+        if (isset ($_GET['filter']) && !empty ($_GET['filter'])) {
+            Blog :: display_day_results($blog_id, Database::escape_string($_GET['filter']));
+        } else {
+            Blog :: display_blog_posts($blog_id);
+        }
 }
 ?>
 </div>

main/exercice/exercise_report.php

Braces +2 added lines, -1 removed lines

@@ -400,8 +400,9 @@
 $extra .= $form->return_form();
 $extra .= '</div>';
 
-if ($is_allowedToEdit)
+if ($is_allowedToEdit) {
     echo $extra;
+}
 
 echo $actions;
 

Spacing +3 added lines, -3 removed lines

@@ -248,7 +248,7 @@ 
             Display::addFlash(
                 Display::return_message(get_lang('MessageSent'))
             );
-            header('Location: ' . api_get_self().'?'.api_get_cidreq().'&exerciseId='.$exerciseId);
+            header('Location: '.api_get_self().'?'.api_get_cidreq().'&exerciseId='.$exerciseId);
             exit;
         }
     }
@@ -278,8 +278,8 @@ 
         api_is_course_tutor() || api_is_course_coach()
     ) {
         $actions .= '<a href="admin.php?exerciseId='.intval($_GET['exerciseId']).'">'.Display :: return_icon('back.png', get_lang('GoBackToQuestionList'), '', ICON_SIZE_MEDIUM).'</a>';
-        $actions .='<a href="live_stats.php?'.api_get_cidreq().'&exerciseId='.$exercise_id.'">'.Display :: return_icon('activity_monitor.png', get_lang('LiveResults'), '', ICON_SIZE_MEDIUM).'</a>';
-        $actions .='<a href="stats.php?'.api_get_cidreq().'&exerciseId='.$exercise_id.'">'.Display :: return_icon('statistics.png', get_lang('ReportByQuestion'), '', ICON_SIZE_MEDIUM).'</a>';
+        $actions .= '<a href="live_stats.php?'.api_get_cidreq().'&exerciseId='.$exercise_id.'">'.Display :: return_icon('activity_monitor.png', get_lang('LiveResults'), '', ICON_SIZE_MEDIUM).'</a>';
+        $actions .= '<a href="stats.php?'.api_get_cidreq().'&exerciseId='.$exercise_id.'">'.Display :: return_icon('statistics.png', get_lang('ReportByQuestion'), '', ICON_SIZE_MEDIUM).'</a>';
 
         $actions .= '<a id="export_opener" href="'.api_get_self().'?export_report=1&exerciseId='.intval($_GET['exerciseId']).'" >'.
         Display::return_icon('save.png', get_lang('Export'), '', ICON_SIZE_MEDIUM).'</a>';

main/exercice/exercise.class.php

Indentation +5 added lines, -5 removed lines

@@ -1966,7 +1966,7 @@ 
                     $label = get_lang('NextQuestion');
                     $class = 'btn btn-primary';
                 }
-				$class .= ' question-validate-btn'; // used to select it with jquery
+                $class .= ' question-validate-btn'; // used to select it with jquery
                 if ($this->type == ONE_PER_PAGE) {
                     if ($questionNum != 1) {
                         $prev_question = $questionNum - 2;
@@ -1991,7 +1991,7 @@ 
                         $all_label = get_lang('EndTest');
                         $class = 'btn btn-warning';
                     }
-					$class .= ' question-validate-btn'; // used to select it with jquery
+                    $class .= ' question-validate-btn'; // used to select it with jquery
                     $all_button = '&nbsp;<a href="javascript://" class="'.$class.'" onclick="validate_all(); ">'.$all_label.'</a>';
                     $all_button .= '&nbsp;' . Display::span(null, ['id' => 'save_all_reponse']);
                     $html .= $all_button;
@@ -3774,7 +3774,7 @@ 
 
         //Fixes multiple answer question in order to be exact
         //if ($answerType == MULTIPLE_ANSWER || $answerType == GLOBAL_MULTIPLE_ANSWER) {
-       /* if ($answerType == GLOBAL_MULTIPLE_ANSWER) {
+        /* if ($answerType == GLOBAL_MULTIPLE_ANSWER) {
             $diff = @array_diff($answer_correct_array, $real_answers);
 
             // All good answers or nothing works like exact
@@ -5073,8 +5073,8 @@ 
     }
 
     /**
-    * @return string
-    */
+     * @return string
+     */
     public function get_formated_title()
     {
         return api_html_entity_decode($this->selectTitle());

Braces +51 added lines, -24 removed lines

@@ -538,10 +538,11 @@ 
      */
     public function isInList($questionId)
     {
-        if (is_array($this->questionList))
-            return in_array($questionId,$this->questionList);
-        else
-            return false;
+        if (is_array($this->questionList)) {
+                    return in_array($questionId,$this->questionList);
+        } else {
+                    return false;
+        }
     }
 
     /**
@@ -1227,10 +1228,11 @@ 
 
             $var = Exercise::selectTimeLimit();
 
-            if (($this->start_time != '0000-00-00 00:00:00'))
-                $form->addElement('html','<div id="start_date_div" style="display:block;">');
-            else
-                $form->addElement('html','<div id="start_date_div" style="display:none;">');
+            if (($this->start_time != '0000-00-00 00:00:00')) {
+                            $form->addElement('html','<div id="start_date_div" style="display:block;">');
+            } else {
+                            $form->addElement('html','<div id="start_date_div" style="display:none;">');
+            }
 
             $form->addElement('date_time_picker', 'start_time');
 
@@ -1238,10 +1240,11 @@ 
 
             $form->addElement('checkbox', 'activate_end_date_check', null , get_lang('EnableEndTime'), array('onclick' => 'activate_end_date()'));
 
-            if (($this->end_time != '0000-00-00 00:00:00'))
-                $form->addElement('html','<div id="end_date_div" style="display:block;">');
-            else
-                $form->addElement('html','<div id="end_date_div" style="display:none;">');
+            if (($this->end_time != '0000-00-00 00:00:00')) {
+                            $form->addElement('html','<div id="end_date_div" style="display:block;">');
+            } else {
+                            $form->addElement('html','<div id="end_date_div" style="display:none;">');
+            }
 
             $form->addElement('date_time_picker', 'end_time');
             $form->addElement('html','</div>');
@@ -2268,7 +2271,9 @@ 
         $organs_at_risk_hit = 0;
         $questionScore = 0;
 
-        if ($debug) error_log('Start answer loop ');
+        if ($debug) {
+            error_log('Start answer loop ');
+        }
 
         $answer_correct_array = array();
 
@@ -2383,7 +2388,9 @@ 
                     }
                     $totalScore += $answerWeighting;
 
-                    if ($debug) error_log("studentChoice: $studentChoice");
+                    if ($debug) {
+                        error_log("studentChoice: $studentChoice");
+                    }
                     break;
                 case GLOBAL_MULTIPLE_ANSWER:
                     if ($from_database) {
@@ -2408,7 +2415,9 @@ 
                         $real_answers[$answerId] = (bool)$studentChoice;
                     }
                     $totalScore += $answerWeighting;
-                    if ($debug) error_log("studentChoice: $studentChoice");
+                    if ($debug) {
+                        error_log("studentChoice: $studentChoice");
+                    }
                     break;
                 case MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE:
                     if ($from_database) {
@@ -3125,9 +3134,13 @@ 
             } // end switch Answertype
 
             if ($show_result) {
-                if ($debug) error_log('show result '.$show_result);
+                if ($debug) {
+                    error_log('show result '.$show_result);
+                }
                 if ($from == 'exercise_result') {
-                    if ($debug) error_log('Showing questions $from '.$from);
+                    if ($debug) {
+                        error_log('Showing questions $from '.$from);
+                    }
                     //display answers (if not matching type, or if the answer is correct)
                     if (
                         !in_array(
@@ -3415,7 +3428,9 @@ 
                         }
                     }
                 } else {
-                    if ($debug) error_log('Showing questions $from '.$from);
+                    if ($debug) {
+                        error_log('Showing questions $from '.$from);
+                    }
 
                     switch ($answerType) {
                         case UNIQUE_ANSWER:
@@ -3747,10 +3762,14 @@ 
                     }
                 }
             }
-            if ($debug) error_log(' ------ ');
+            if ($debug) {
+                error_log(' ------ ');
+            }
         } // end for that loops over all answers of the current question
 
-        if ($debug) error_log('-- end answer loop --');
+        if ($debug) {
+            error_log('-- end answer loop --');
+        }
 
         $final_answer = true;
 
@@ -3823,7 +3842,9 @@ 
             //  some results that haven't been stored in the database yet
             if ($answerType == HOT_SPOT || $answerType == HOT_SPOT_ORDER || $answerType == HOT_SPOT_DELINEATION ) {
 
-                if ($debug) error_log('$from AND this is a hotspot kind of question ');
+                if ($debug) {
+                    error_log('$from AND this is a hotspot kind of question ');
+                }
 
                 $my_exe_id = 0;
                 $from_database = 0;
@@ -3999,8 +4020,12 @@ 
         // stored by exercise_results.php (using the session)
 
         if ($saved_results) {
-            if ($debug) error_log("Save question results $saved_results");
-            if ($debug) error_log(print_r($choice ,1 ));
+            if ($debug) {
+                error_log("Save question results $saved_results");
+            }
+            if ($debug) {
+                error_log(print_r($choice ,1 ));
+            }
 
             if (empty($choice)) {
                 $choice = 0;
@@ -4102,7 +4127,9 @@ 
             $sql = 'UPDATE ' . $stat_table . ' SET
                         exe_result = exe_result + ' . floatval($questionScore) . '
                     WHERE exe_id = ' . $exeId;
-            if ($debug) error_log($sql);
+            if ($debug) {
+                error_log($sql);
+            }
             Database::query($sql);
         }
 

Doc Comments +13 added lines, -8 removed lines

@@ -354,7 +354,7 @@ 
     }
 
     /**
-     * @return int
+     * @return string
      */
     public function selectPassPercentage()
     {
@@ -473,7 +473,7 @@ 
      * tells if questions are selected randomly, and if so returns the draws
      *
      * @author Olivier Brouckaert
-     * @return integer - 0 if not random, otherwise the draws
+     * @return boolean - 0 if not random, otherwise the draws
      */
     public function isRandom()
     {
@@ -2830,7 +2830,7 @@ 
      * @param int  int lp id
      * @param int  int lp item id
      * @param int  int lp item_view id
-     * @param float $weight
+     * @param integer $weight
      * @param array question list
      */
     public function save_stat_track_exercise_info(
@@ -5118,6 +5118,7 @@ 
     /**
      * Sends a notification when a user ends an examn
      *
+     * @param integer $exe_id
      */
     public function send_mail_notification_for_exam($question_list_answers, $origin, $exe_id)
     {
@@ -5198,6 +5199,7 @@ 
     /**
      * Sends a notification when a user ends an examn
      *
+     * @param integer $exe_id
      */
     function send_notification_for_open_questions($question_list_answers, $origin, $exe_id)
     {
@@ -5295,6 +5297,9 @@ 
         }
     }
 
+    /**
+     * @param integer $exe_id
+     */
     function send_notification_for_oral_questions($question_list_answers, $origin, $exe_id)
     {
         if (api_get_course_setting('email_alert_manager_on_new_quiz') != 1 ) {
@@ -5388,7 +5393,7 @@ 
 
     /**
      * @param array $user_data result of api_get_user_info()
-     * @param null $start_date
+     * @param string $start_date
      * @param null $duration
      * @param string $ip Optional. The user IP
      * @return string
@@ -5446,7 +5451,7 @@ 
      * @param int     Maximum number of attempts (0 if no limit)
      * @param int     Feedback type
      * @todo this was function was added due the import exercise via CSV
-     * @return    int New exercise ID
+     * @return    string New exercise ID
      */
     public function createExercise(
         $title,
@@ -6795,7 +6800,7 @@ 
      * @param bool $show_comment
      * @param null $exercise_feedback
      * @param bool $show_answers
-     * @param null $modelType
+     * @param integer $modelType
      * @param bool $categoryMinusOne
      * @return bool|null|string
      */
@@ -7956,8 +7961,8 @@ 
     /**
      * Returns an HTML ribbon to show on top of the exercise result, with
      * colouring depending on the success or failure of the student
-     * @param $score
-     * @param $weight
+     * @param integer $score
+     * @param integer $weight
      * @param bool $check_pass_percentage
      * @return string
      */

Spacing +344 added lines, -344 removed lines

@@ -29,7 +29,7 @@ 
     public $feedback_type;
     public $end_time;
     public $start_time;
-    public $questionList;  // array with the list of this exercise's questions
+    public $questionList; // array with the list of this exercise's questions
     /* including question list of the media */
     public $questionListUncompressed;
     public $results_disabled;
@@ -132,7 +132,7 @@ 
         $TBL_EXERCISES = Database::get_course_table(TABLE_QUIZ_TEST);
         $table_lp_item = Database::get_course_table(TABLE_LP_ITEM);
 
-        $id  = intval($id);
+        $id = intval($id);
         if (empty($this->course_id)) {
 
             return false;
@@ -478,7 +478,7 @@ 
      */
     public function isRandom()
     {
-        if($this->random > 0 || $this->random == -1) {
+        if ($this->random > 0 || $this->random == -1) {
             return true;
         } else {
             return false;
@@ -639,7 +639,7 @@ 
                     $question_media = null;
                     if (!empty($objQuestionTmp->parent_id)) {
                         $objQuestionMedia = Question::read($objQuestionTmp->parent_id);
-                        $question_media  = Question::getMediaLabel($objQuestionMedia->question);
+                        $question_media = Question::getMediaLabel($objQuestionMedia->question);
                     }
 
                     $questionType = Display::tag('div', Display::return_icon($typeImg, $typeExpl, array(), ICON_SIZE_MEDIUM).$question_media);
@@ -1032,7 +1032,7 @@ 
 
             foreach ($questions_by_category as $categoryId => $questionList) {
                 $cat = new TestCategory($categoryId);
-                $cat = (array)$cat;
+                $cat = (array) $cat;
                 $cat['iid'] = $cat['id'];
                 //*$cat['name'] = $cat['name'];
 
@@ -1097,7 +1097,7 @@ 
     {
         if ($this->specialCategoryOrders == false) {
             if ($from_db && !empty($this->id)) {
-                $TBL_EXERCISE_QUESTION  = Database::get_course_table(TABLE_QUIZ_TEST_QUESTION);
+                $TBL_EXERCISE_QUESTION = Database::get_course_table(TABLE_QUIZ_TEST_QUESTION);
                 $TBL_QUESTIONS = Database::get_course_table(TABLE_QUIZ_QUESTION);
 
                 $sql = "SELECT DISTINCT e.question_order
@@ -1124,7 +1124,7 @@ 
                 $question_list = array();
 
                 while ($new_object = Database::fetch_object($result)) {
-                    $question_list[$new_object->question_order]=  $new_object->question_id;
+                    $question_list[$new_object->question_order] = $new_object->question_id;
                     $temp_question_list[$counter] = $new_object->question_id;
                     $counter++;
                 }
@@ -1268,7 +1268,7 @@ 
     public function isInList($questionId)
     {
         if (is_array($this->questionList))
-            return in_array($questionId,$this->questionList);
+            return in_array($questionId, $this->questionList);
         else
             return false;
     }
@@ -1281,7 +1281,7 @@ 
      */
     public function updateTitle($title)
     {
-        $this->exercise=$title;
+        $this->exercise = $title;
     }
 
     /**
@@ -1291,7 +1291,7 @@ 
      */
     public function updateAttempts($attempts)
     {
-        $this->attempts=$attempts;
+        $this->attempts = $attempts;
     }
 
     /**
@@ -1301,7 +1301,7 @@ 
      */
     public function updateFeedbackType($feedback_type)
     {
-        $this->feedback_type=$feedback_type;
+        $this->feedback_type = $feedback_type;
     }
 
     /**
@@ -1312,7 +1312,7 @@ 
      */
     public function updateDescription($description)
     {
-        $this->description=$description;
+        $this->description = $description;
     }
 
     /**
@@ -1442,23 +1442,23 @@ 
      * @param string $sound - exercise sound file
      * @param string $delete - ask to delete the file
      */
-    public function updateSound($sound,$delete)
+    public function updateSound($sound, $delete)
     {
         global $audioPath, $documentPath;
         $TBL_DOCUMENT = Database::get_course_table(TABLE_DOCUMENT);
 
-        if ($sound['size'] && (strstr($sound['type'],'audio') || strstr($sound['type'],'video'))) {
-            $this->sound=$sound['name'];
+        if ($sound['size'] && (strstr($sound['type'], 'audio') || strstr($sound['type'], 'video'))) {
+            $this->sound = $sound['name'];
 
-            if (@move_uploaded_file($sound['tmp_name'],$audioPath.'/'.$this->sound)) {
+            if (@move_uploaded_file($sound['tmp_name'], $audioPath.'/'.$this->sound)) {
                 $query = "SELECT 1 FROM $TBL_DOCUMENT
-                        WHERE c_id = ".$this->course_id." AND path='".str_replace($documentPath,'',$audioPath).'/'.$this->sound."'";
-                $result=Database::query($query);
+                        WHERE c_id = ".$this->course_id." AND path='".str_replace($documentPath, '', $audioPath).'/'.$this->sound."'";
+                $result = Database::query($query);
 
                 if (!Database::num_rows($result)) {
                     $id = add_document(
                         $this->course,
-                        str_replace($documentPath,'',$audioPath).'/'.$this->sound,
+                        str_replace($documentPath, '', $audioPath).'/'.$this->sound,
                         'file',
                         $sound['size'],
                         $sound['name']
@@ -1477,8 +1477,8 @@ 
                     );
                 }
             }
-        } elseif($delete && is_file($audioPath.'/'.$this->sound)) {
-            $this->sound='';
+        } elseif ($delete && is_file($audioPath.'/'.$this->sound)) {
+            $this->sound = '';
         }
     }
 
@@ -1490,7 +1490,7 @@ 
      */
     public function updateType($type)
     {
-        $this->type=$type;
+        $this->type = $type;
     }
 
     /**
@@ -1526,7 +1526,7 @@ 
      */
     public function enable()
     {
-        $this->active=1;
+        $this->active = 1;
     }
 
     /**
@@ -1536,7 +1536,7 @@ 
      */
     public function disable()
     {
-        $this->active=0;
+        $this->active = 0;
     }
 
     /**
@@ -1664,7 +1664,7 @@ 
                 api_get_user_id()
             );
 
-            if (api_get_setting('search_enabled')=='true') {
+            if (api_get_setting('search_enabled') == 'true') {
                 $this->search_engine_edit();
             }
         } else {
@@ -1812,7 +1812,7 @@ 
     public function removeFromList($questionId)
     {
         // searches the position of the question ID in the list
-        $pos = array_search($questionId,$this->questionList);
+        $pos = array_search($questionId, $this->questionList);
 
         // question not found
         if ($pos === false) {
@@ -1847,7 +1847,7 @@ 
         api_item_property_update($this->course, TOOL_QUIZ, $this->id, 'QuizDeleted', api_get_user_id());
         api_item_property_update($this->course, TOOL_QUIZ, $this->id, 'delete', api_get_user_id());
 
-        if (api_get_setting('search_enabled')=='true' && extension_loaded('xapian') ) {
+        if (api_get_setting('search_enabled') == 'true' && extension_loaded('xapian')) {
             $this->search_engine_delete();
         }
     }
@@ -1856,7 +1856,7 @@ 
      * Creates the form to create / edit an exercise
      * @param FormValidator $form
      */
-    public function createForm($form, $type='full')
+    public function createForm($form, $type = 'full')
     {
         if (empty($type)) {
             $type = 'full';
@@ -1887,7 +1887,7 @@ 
             'Width' => '100%',
             'Height' => '150',
         );
-        if (is_array($type)){
+        if (is_array($type)) {
             $editor_config = array_merge($editor_config, $type);
         }
 
@@ -1941,7 +1941,7 @@ 
                     '2',
                     array('id' => 'exerciseType_2')
                 );
-                $form->addGroup($radios_feedback, null, array(get_lang('FeedbackType'),get_lang('FeedbackDisplayOptions')), '');
+                $form->addGroup($radios_feedback, null, array(get_lang('FeedbackType'), get_lang('FeedbackDisplayOptions')), '');
 
                 // Type of results display on the final page
                 $radios_results_disabled = array();
@@ -1985,8 +1985,8 @@ 
                 // Type of questions disposition on page
                 $radios = array();
 
-                $radios[] = $form->createElement('radio', 'exerciseType', null, get_lang('SimpleExercise'),    '1', array('onclick' => 'check_per_page_all()', 'id'=>'option_page_all'));
-                $radios[] = $form->createElement('radio', 'exerciseType', null, get_lang('SequentialExercise'),'2', array('onclick' => 'check_per_page_one()', 'id'=>'option_page_one'));
+                $radios[] = $form->createElement('radio', 'exerciseType', null, get_lang('SimpleExercise'), '1', array('onclick' => 'check_per_page_all()', 'id'=>'option_page_all'));
+                $radios[] = $form->createElement('radio', 'exerciseType', null, get_lang('SequentialExercise'), '2', array('onclick' => 'check_per_page_one()', 'id'=>'option_page_one'));
 
                 $form->addGroup($radios, null, get_lang('QuestionsPerPage'), '');
 
@@ -1996,33 +1996,33 @@ 
 
                     // feedback type
                     $radios_feedback = array();
-                    $radios_feedback[] = $form->createElement('radio', 'exerciseFeedbackType', null, get_lang('ExerciseAtTheEndOfTheTest'),'0',array('id' =>'exerciseType_0', 'onclick' => 'check_feedback()'));
+                    $radios_feedback[] = $form->createElement('radio', 'exerciseFeedbackType', null, get_lang('ExerciseAtTheEndOfTheTest'), '0', array('id' =>'exerciseType_0', 'onclick' => 'check_feedback()'));
 
                     if (api_get_setting('enable_quiz_scenario') == 'true') {
-                        $radios_feedback[] = $form->createElement('radio', 'exerciseFeedbackType', null, get_lang('DirectFeedback'), '1', array('id' =>'exerciseType_1' , 'onclick' => 'check_direct_feedback()'));
+                        $radios_feedback[] = $form->createElement('radio', 'exerciseFeedbackType', null, get_lang('DirectFeedback'), '1', array('id' =>'exerciseType_1', 'onclick' => 'check_direct_feedback()'));
                     }
-                    $radios_feedback[] = $form->createElement('radio', 'exerciseFeedbackType', null, get_lang('NoFeedback'),'2',array('id' =>'exerciseType_2'));
-                    $form->addGroup($radios_feedback, null, array(get_lang('FeedbackType'),get_lang('FeedbackDisplayOptions')));
+                    $radios_feedback[] = $form->createElement('radio', 'exerciseFeedbackType', null, get_lang('NoFeedback'), '2', array('id' =>'exerciseType_2'));
+                    $form->addGroup($radios_feedback, null, array(get_lang('FeedbackType'), get_lang('FeedbackDisplayOptions')));
 
                     //$form->addElement('select', 'exerciseFeedbackType',get_lang('FeedbackType'),$feedback_option,'onchange="javascript:feedbackselection()"');
                     $radios_results_disabled = array();
                     $radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('ShowScoreAndRightAnswer'), '0', array('id'=>'result_disabled_0'));
-                    $radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('DoNotShowScoreNorRightAnswer'),  '1',array('id'=>'result_disabled_1','onclick' => 'check_results_disabled()'));
-                    $radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('OnlyShowScore'),  '2',array('id'=>'result_disabled_2','onclick' => 'check_results_disabled()'));
-                    $form->addGroup($radios_results_disabled, null, get_lang('ShowResultsToStudents'),'');
+                    $radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('DoNotShowScoreNorRightAnswer'), '1', array('id'=>'result_disabled_1', 'onclick' => 'check_results_disabled()'));
+                    $radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('OnlyShowScore'), '2', array('id'=>'result_disabled_2', 'onclick' => 'check_results_disabled()'));
+                    $form->addGroup($radios_results_disabled, null, get_lang('ShowResultsToStudents'), '');
 
                     // Type of questions disposition on page
                     $radios = array();
-                    $radios[] = $form->createElement('radio', 'exerciseType', null, get_lang('SimpleExercise'),    '1');
-                    $radios[] = $form->createElement('radio', 'exerciseType', null, get_lang('SequentialExercise'),'2');
+                    $radios[] = $form->createElement('radio', 'exerciseType', null, get_lang('SimpleExercise'), '1');
+                    $radios[] = $form->createElement('radio', 'exerciseType', null, get_lang('SequentialExercise'), '2');
                     $form->addGroup($radios, null, get_lang('ExerciseType'));
 
                 } else {
                     //Show options freeze
                     $radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('ShowScoreAndRightAnswer'), '0', array('id'=>'result_disabled_0'));
-                    $radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('DoNotShowScoreNorRightAnswer'),  '1',array('id'=>'result_disabled_1','onclick' => 'check_results_disabled()'));
-                    $radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('OnlyShowScore'),  '2',array('id'=>'result_disabled_2','onclick' => 'check_results_disabled()'));
-                    $result_disable_group = $form->addGroup($radios_results_disabled, null, get_lang('ShowResultsToStudents'),'');
+                    $radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('DoNotShowScoreNorRightAnswer'), '1', array('id'=>'result_disabled_1', 'onclick' => 'check_results_disabled()'));
+                    $radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('OnlyShowScore'), '2', array('id'=>'result_disabled_2', 'onclick' => 'check_results_disabled()'));
+                    $result_disable_group = $form->addGroup($radios_results_disabled, null, get_lang('ShowResultsToStudents'), '');
                     $result_disable_group->freeze();
 
                     //we force the options to the DirectFeedback exercisetype
@@ -2030,8 +2030,8 @@ 
                     $form->addElement('hidden', 'exerciseType', ONE_PER_PAGE);
 
                     // Type of questions disposition on page
-                    $radios[] = $form->createElement('radio', 'exerciseType', null, get_lang('SimpleExercise'),    '1', array('onclick' => 'check_per_page_all()', 'id'=>'option_page_all'));
-                    $radios[] = $form->createElement('radio', 'exerciseType', null, get_lang('SequentialExercise'),'2', array('onclick' => 'check_per_page_one()', 'id'=>'option_page_one'));
+                    $radios[] = $form->createElement('radio', 'exerciseType', null, get_lang('SimpleExercise'), '1', array('onclick' => 'check_per_page_all()', 'id'=>'option_page_all'));
+                    $radios[] = $form->createElement('radio', 'exerciseType', null, get_lang('SequentialExercise'), '2', array('onclick' => 'check_per_page_one()', 'id'=>'option_page_one'));
 
                     $type_group = $form->addGroup($radios, null, get_lang('QuestionsPerPage'), '');
                     $type_group->freeze();
@@ -2163,26 +2163,26 @@ 
 
                 // number of random question
 
-                $max = ($this->id > 0) ? $this->selectNbrQuestions() : 10 ;
+                $max = ($this->id > 0) ? $this->selectNbrQuestions() : 10;
                 $option = range(0, $max);
                 $option[0] = get_lang('No');
                 $option[-1] = get_lang('AllQuestionsShort');
-                $form->addElement('select', 'randomQuestions',array(get_lang('RandomQuestions'), get_lang('RandomQuestionsHelp')), $option, array('id'=>'randomQuestions'));
+                $form->addElement('select', 'randomQuestions', array(get_lang('RandomQuestions'), get_lang('RandomQuestionsHelp')), $option, array('id'=>'randomQuestions'));
 
                 // Random answers
                 $radios_random_answers = array();
-                $radios_random_answers[] = $form->createElement('radio', 'randomAnswers', null, get_lang('Yes'),'1');
-                $radios_random_answers[] = $form->createElement('radio', 'randomAnswers', null, get_lang('No'),'0');
+                $radios_random_answers[] = $form->createElement('radio', 'randomAnswers', null, get_lang('Yes'), '1');
+                $radios_random_answers[] = $form->createElement('radio', 'randomAnswers', null, get_lang('No'), '0');
                 $form->addGroup($radios_random_answers, null, get_lang('RandomAnswers'), '');
 
                 // Random by category
-                $form->addElement('html','<div class="clear">&nbsp;</div>');
+                $form->addElement('html', '<div class="clear">&nbsp;</div>');
                 $radiocat = array();
-                $radiocat[] = $form->createElement('radio', 'randomByCat', null, get_lang('YesWithCategoriesShuffled'),'1');
-                $radiocat[] = $form->createElement('radio', 'randomByCat', null, get_lang('YesWithCategoriesSorted'),'2');
-                $radiocat[] = $form->createElement('radio', 'randomByCat', null, get_lang('No'),'0');
+                $radiocat[] = $form->createElement('radio', 'randomByCat', null, get_lang('YesWithCategoriesShuffled'), '1');
+                $radiocat[] = $form->createElement('radio', 'randomByCat', null, get_lang('YesWithCategoriesSorted'), '2');
+                $radiocat[] = $form->createElement('radio', 'randomByCat', null, get_lang('No'), '0');
                 $radioCatGroup = $form->addGroup($radiocat, null, get_lang('RandomQuestionByCategory'), '');
-                $form->addElement('html','<div class="clear">&nbsp;</div>');
+                $form->addElement('html', '<div class="clear">&nbsp;</div>');
 
                 // add the radio display the category name for student
                 $radio_display_cat_name = array();
@@ -2203,36 +2203,36 @@ 
             );
 
             // Exercise time limit
-            $form->addElement('checkbox', 'activate_start_date_check',null, get_lang('EnableStartTime'), array('onclick' => 'activate_start_date()'));
+            $form->addElement('checkbox', 'activate_start_date_check', null, get_lang('EnableStartTime'), array('onclick' => 'activate_start_date()'));
 
             $var = Exercise::selectTimeLimit();
 
             if (($this->start_time != '0000-00-00 00:00:00'))
-                $form->addElement('html','<div id="start_date_div" style="display:block;">');
+                $form->addElement('html', '<div id="start_date_div" style="display:block;">');
             else
-                $form->addElement('html','<div id="start_date_div" style="display:none;">');
+                $form->addElement('html', '<div id="start_date_div" style="display:none;">');
 
             $form->addElement('date_time_picker', 'start_time');
 
-            $form->addElement('html','</div>');
+            $form->addElement('html', '</div>');
 
-            $form->addElement('checkbox', 'activate_end_date_check', null , get_lang('EnableEndTime'), array('onclick' => 'activate_end_date()'));
+            $form->addElement('checkbox', 'activate_end_date_check', null, get_lang('EnableEndTime'), array('onclick' => 'activate_end_date()'));
 
             if (($this->end_time != '0000-00-00 00:00:00'))
-                $form->addElement('html','<div id="end_date_div" style="display:block;">');
+                $form->addElement('html', '<div id="end_date_div" style="display:block;">');
             else
-                $form->addElement('html','<div id="end_date_div" style="display:none;">');
+                $form->addElement('html', '<div id="end_date_div" style="display:none;">');
 
             $form->addElement('date_time_picker', 'end_time');
-            $form->addElement('html','</div>');
+            $form->addElement('html', '</div>');
 
             //$check_option=$this->selectType();
             $diplay = 'block';
             $form->addElement('checkbox', 'propagate_neg', null, get_lang('PropagateNegativeResults'));
-            $form->addElement('html','<div class="clear">&nbsp;</div>');
+            $form->addElement('html', '<div class="clear">&nbsp;</div>');
             $form->addElement('checkbox', 'review_answers', null, get_lang('ReviewAnswers'));
 
-            $form->addElement('html','<div id="divtimecontrol"  style="display:'.$diplay.';">');
+            $form->addElement('html', '<div id="divtimecontrol"  style="display:'.$diplay.';">');
 
             //Timer control
             //$time_hours_option = range(0,12);
@@ -2248,12 +2248,12 @@ 
                     'onload' => 'check_load_time()',
                 )
             );
-            $expired_date = (int)$this->selectExpiredTime();
+            $expired_date = (int) $this->selectExpiredTime();
 
-            if (($expired_date!='0')) {
-                $form->addElement('html','<div id="timercontrol" style="display:block;">');
+            if (($expired_date != '0')) {
+                $form->addElement('html', '<div id="timercontrol" style="display:block;">');
             } else {
-                $form->addElement('html','<div id="timercontrol" style="display:none;">');
+                $form->addElement('html', '<div id="timercontrol" style="display:none;">');
             }
             $form->addText(
                 'enabletimercontroltotalminutes',
@@ -2264,7 +2264,7 @@ 
                     'cols-size' => [2, 2, 8]
                 ]
             );
-            $form->addElement('html','</div>');
+            $form->addElement('html', '</div>');
 
             $form->addElement(
                 'text',
@@ -2288,23 +2288,23 @@ 
             $defaults = array();
 
             if (api_get_setting('search_enabled') === 'true') {
-                require_once api_get_path(LIBRARY_PATH) . 'specific_fields_manager.lib.php';
+                require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php';
 
-                $form->addElement ('checkbox', 'index_document','', get_lang('SearchFeatureDoIndexDocument'));
-                $form->addElement ('select_language', 'language', get_lang('SearchFeatureDocumentLanguage'));
+                $form->addElement('checkbox', 'index_document', '', get_lang('SearchFeatureDoIndexDocument'));
+                $form->addElement('select_language', 'language', get_lang('SearchFeatureDocumentLanguage'));
 
                 $specific_fields = get_specific_field_list();
 
                 foreach ($specific_fields as $specific_field) {
-                    $form->addElement ('text', $specific_field['code'], $specific_field['name']);
+                    $form->addElement('text', $specific_field['code'], $specific_field['name']);
                     $filter = array(
                         'c_id' => api_get_course_int_id(),
                         'field_id' => $specific_field['id'],
                         'ref_id' => $this->id,
-                        'tool_id' => "'" . TOOL_QUIZ . "'"
+                        'tool_id' => "'".TOOL_QUIZ."'"
                     );
                     $values = get_specific_field_values_list($filter, array('value'));
-                    if ( !empty($values) ) {
+                    if (!empty($values)) {
                         $arr_str_values = array();
                         foreach ($values as $value) {
                             $arr_str_values[] = $value['value'];
@@ -2315,8 +2315,8 @@ 
                 //$form->addElement ('html','</div>');
             }
 
-            $form->addElement('html','</div>');  //End advanced setting
-            $form->addElement('html','</div>');
+            $form->addElement('html', '</div>'); //End advanced setting
+            $form->addElement('html', '</div>');
         }
 
         // submit
@@ -2336,10 +2336,10 @@ 
         }
 
         // defaults
-        if ($type=='full') {
+        if ($type == 'full') {
             if ($this->id > 0) {
                 if ($this->random > $this->selectNbrQuestions()) {
-                    $defaults['randomQuestions'] =  $this->selectNbrQuestions();
+                    $defaults['randomQuestions'] = $this->selectNbrQuestions();
                 } else {
                     $defaults['randomQuestions'] = $this->random;
                 }
@@ -2366,8 +2366,8 @@ 
                     $defaults['activate_end_date_check'] = 1;
                 }
 
-                $defaults['start_time'] = ($this->start_time!='0000-00-00 00:00:00') ? api_get_local_time($this->start_time) : date('Y-m-d 12:00:00');
-                $defaults['end_time'] = ($this->end_time!='0000-00-00 00:00:00') ? api_get_local_time($this->end_time) : date('Y-m-d 12:00:00', time()+84600);
+                $defaults['start_time'] = ($this->start_time != '0000-00-00 00:00:00') ? api_get_local_time($this->start_time) : date('Y-m-d 12:00:00');
+                $defaults['end_time'] = ($this->end_time != '0000-00-00 00:00:00') ? api_get_local_time($this->end_time) : date('Y-m-d 12:00:00', time() + 84600);
 
                 // Get expired time
                 if ($this->expired_time != '0') {
@@ -2388,7 +2388,7 @@ 
                 $defaults['text_when_finished'] = "";
                 $defaults['start_time'] = date('Y-m-d 12:00:00');
                 $defaults['display_category_name'] = 1;
-                $defaults['end_time']   = date('Y-m-d 12:00:00', time()+84600);
+                $defaults['end_time']   = date('Y-m-d 12:00:00', time() + 84600);
                 $defaults['pass_percentage'] = '';
                 $defaults['end_button'] = $this->selectEndButton();
                 $defaults['question_selection_type'] = 1;
@@ -2474,7 +2474,7 @@ 
             $end_time = $form->getSubmitValue('end_time');
             $this->end_time = api_get_utc_datetime($end_time);
         } else {
-            $this->end_time   = '0000-00-00 00:00:00';
+            $this->end_time = '0000-00-00 00:00:00';
         }
 
         if ($form->getSubmitValue('enabletimercontrol') == 1) {
@@ -2487,9 +2487,9 @@ 
         }
 
         if ($form->getSubmitValue('randomAnswers') == 1) {
-            $this->random_answers=1;
+            $this->random_answers = 1;
         } else {
-            $this->random_answers=0;
+            $this->random_answers = 0;
         }
         $this->save($type);
     }
@@ -2501,9 +2501,9 @@ 
         }
         $course_id = api_get_course_id();
 
-        require_once api_get_path(LIBRARY_PATH) . 'search/ChamiloIndexer.class.php';
-        require_once api_get_path(LIBRARY_PATH) . 'search/IndexableChunk.class.php';
-        require_once api_get_path(LIBRARY_PATH) . 'specific_fields_manager.lib.php';
+        require_once api_get_path(LIBRARY_PATH).'search/ChamiloIndexer.class.php';
+        require_once api_get_path(LIBRARY_PATH).'search/IndexableChunk.class.php';
+        require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php';
 
         $specific_fields = get_specific_field_list();
         $ic_slide = new IndexableChunk();
@@ -2513,7 +2513,7 @@ 
             if (isset($_REQUEST[$specific_field['code']])) {
                 $sterms = trim($_REQUEST[$specific_field['code']]);
                 if (!empty($sterms)) {
-                    $all_specific_terms .= ' '. $sterms;
+                    $all_specific_terms .= ' '.$sterms;
                     $sterms = explode(',', $sterms);
                     foreach ($sterms as $sterm) {
                         $ic_slide->addTerm(trim($sterm), $specific_field['code']);
@@ -2530,15 +2530,15 @@ 
         $xapian_data = array(
             SE_COURSE_ID => $course_id,
             SE_TOOL_ID => TOOL_QUIZ,
-            SE_DATA => array('type' => SE_DOCTYPE_EXERCISE_EXERCISE, 'exercise_id' => (int)$this->id),
-            SE_USER => (int)api_get_user_id(),
+            SE_DATA => array('type' => SE_DOCTYPE_EXERCISE_EXERCISE, 'exercise_id' => (int) $this->id),
+            SE_USER => (int) api_get_user_id(),
         );
         $ic_slide->xapian_data = serialize($xapian_data);
-        $exercise_description = $all_specific_terms .' '. $this->description;
+        $exercise_description = $all_specific_terms.' '.$this->description;
         $ic_slide->addValue("content", $exercise_description);
 
         $di = new ChamiloIndexer();
-        isset($_POST['language'])? $lang=Database::escape_string($_POST['language']): $lang = 'english';
+        isset($_POST['language']) ? $lang = Database::escape_string($_POST['language']) : $lang = 'english';
         $di->connectDb(NULL, NULL, $lang);
         $di->addChunk($ic_slide);
 
@@ -2557,7 +2557,7 @@ 
     function search_engine_edit()
     {
         // update search enchine and its values table if enabled
-        if (api_get_setting('search_enabled')=='true' && extension_loaded('xapian')) {
+        if (api_get_setting('search_enabled') == 'true' && extension_loaded('xapian')) {
             $course_id = api_get_course_id();
 
             // actually, it consists on delete terms from db,
@@ -2569,9 +2569,9 @@ 
             $res = Database::query($sql);
 
             if (Database::num_rows($res) > 0) {
-                require_once(api_get_path(LIBRARY_PATH) . 'search/ChamiloIndexer.class.php');
-                require_once(api_get_path(LIBRARY_PATH) . 'search/IndexableChunk.class.php');
-                require_once(api_get_path(LIBRARY_PATH) . 'specific_fields_manager.lib.php');
+                require_once(api_get_path(LIBRARY_PATH).'search/ChamiloIndexer.class.php');
+                require_once(api_get_path(LIBRARY_PATH).'search/IndexableChunk.class.php');
+                require_once(api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php');
 
                 $se_ref = Database::fetch_array($res);
                 $specific_fields = get_specific_field_list();
@@ -2582,7 +2582,7 @@ 
                     delete_all_specific_field_value($course_id, $specific_field['id'], TOOL_QUIZ, $this->id);
                     if (isset($_REQUEST[$specific_field['code']])) {
                         $sterms = trim($_REQUEST[$specific_field['code']]);
-                        $all_specific_terms .= ' '. $sterms;
+                        $all_specific_terms .= ' '.$sterms;
                         $sterms = explode(',', $sterms);
                         foreach ($sterms as $sterm) {
                             $ic_slide->addTerm(trim($sterm), $specific_field['code']);
@@ -2598,17 +2598,17 @@ 
                 $xapian_data = array(
                     SE_COURSE_ID => $course_id,
                     SE_TOOL_ID => TOOL_QUIZ,
-                    SE_DATA => array('type' => SE_DOCTYPE_EXERCISE_EXERCISE, 'exercise_id' => (int)$this->id),
-                    SE_USER => (int)api_get_user_id(),
+                    SE_DATA => array('type' => SE_DOCTYPE_EXERCISE_EXERCISE, 'exercise_id' => (int) $this->id),
+                    SE_USER => (int) api_get_user_id(),
                 );
                 $ic_slide->xapian_data = serialize($xapian_data);
-                $exercise_description = $all_specific_terms .' '. $this->description;
+                $exercise_description = $all_specific_terms.' '.$this->description;
                 $ic_slide->addValue("content", $exercise_description);
 
                 $di = new ChamiloIndexer();
-                isset($_POST['language'])? $lang=Database::escape_string($_POST['language']): $lang = 'english';
+                isset($_POST['language']) ? $lang = Database::escape_string($_POST['language']) : $lang = 'english';
                 $di->connectDb(NULL, NULL, $lang);
-                $di->remove_document((int)$se_ref['search_did']);
+                $di->remove_document((int) $se_ref['search_did']);
                 $di->addChunk($ic_slide);
 
                 //index and return search engine document id
@@ -2633,7 +2633,7 @@ 
     function search_engine_delete()
     {
         // remove from search engine if enabled
-        if (api_get_setting('search_enabled') == 'true' && extension_loaded('xapian') ) {
+        if (api_get_setting('search_enabled') == 'true' && extension_loaded('xapian')) {
             $course_id = api_get_course_id();
             $tbl_se_ref = Database::get_main_table(TABLE_MAIN_SEARCH_ENGINE_REF);
             $sql = 'SELECT * FROM %s WHERE course_code=\'%s\' AND tool_id=\'%s\' AND ref_id_high_level=%s AND ref_id_second_level IS NULL LIMIT 1';
@@ -2641,19 +2641,19 @@ 
             $res = Database::query($sql);
             if (Database::num_rows($res) > 0) {
                 $row = Database::fetch_array($res);
-                require_once(api_get_path(LIBRARY_PATH) .'search/ChamiloIndexer.class.php');
+                require_once(api_get_path(LIBRARY_PATH).'search/ChamiloIndexer.class.php');
                 $di = new ChamiloIndexer();
-                $di->remove_document((int)$row['search_did']);
+                $di->remove_document((int) $row['search_did']);
                 unset($di);
                 $tbl_quiz_question = Database::get_course_table(TABLE_QUIZ_QUESTION);
-                foreach ( $this->questionList as $question_i) {
+                foreach ($this->questionList as $question_i) {
                     $sql = 'SELECT type FROM %s WHERE id=%s';
                     $sql = sprintf($sql, $tbl_quiz_question, $question_i);
                     $qres = Database::query($sql);
                     if (Database::num_rows($qres) > 0) {
                         $qrow = Database::fetch_array($qres);
                         $objQuestion = Question::getInstance($qrow['type']);
-                        $objQuestion = Question::read((int)$question_i);
+                        $objQuestion = Question::read((int) $question_i);
                         $objQuestion->search_engine_edit($this->id, FALSE, TRUE);
                         unset($objQuestion);
                     }
@@ -2664,7 +2664,7 @@ 
             Database::query($sql);
 
             // remove terms from db
-            require_once api_get_path(LIBRARY_PATH) .'specific_fields_manager.lib.php';
+            require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php';
             delete_all_values_for_item($course_id, TOOL_QUIZ, $this->id);
         }
     }
@@ -2759,7 +2759,7 @@ 
      */
     public function copy_exercise()
     {
-        $exercise_obj= new Exercise();
+        $exercise_obj = new Exercise();
         $exercise_obj = $this;
 
         // force the creation of a new exercise
@@ -2831,25 +2831,25 @@ 
             $lp_id = 0;
         }
         if (empty($lp_item_id)) {
-            $lp_item_id   = 0;
+            $lp_item_id = 0;
         }
         if (empty($lp_item_view_id)) {
             $lp_item_view_id = 0;
         }
-        $condition = ' WHERE exe_exo_id 	= ' . "'" . $this->id . "'" .' AND
-					   exe_user_id 			= ' . "'" . api_get_user_id() . "'" . ' AND
-					   c_id                 = ' . api_get_course_int_id() . ' AND
-					   status 				= ' . "'" . Database::escape_string($status). "'" . ' AND
-					   orig_lp_id 			= ' . "'" . $lp_id . "'" . ' AND
-					   orig_lp_item_id 		= ' . "'" . $lp_item_id . "'" . ' AND
-                       orig_lp_item_view_id = ' . "'" . $lp_item_view_id . "'" . ' AND
-					   session_id 			= ' . "'" . api_get_session_id() . "' LIMIT 1"; //Adding limit 1 just in case
+        $condition = ' WHERE exe_exo_id 	= '."'".$this->id."'".' AND
+					   exe_user_id 			= ' . "'".api_get_user_id()."'".' AND
+					   c_id                 = ' . api_get_course_int_id().' AND
+					   status 				= ' . "'".Database::escape_string($status)."'".' AND
+					   orig_lp_id 			= ' . "'".$lp_id."'".' AND
+					   orig_lp_item_id 		= ' . "'".$lp_item_id."'".' AND
+                       orig_lp_item_view_id = ' . "'".$lp_item_view_id."'".' AND
+					   session_id 			= ' . "'".api_get_session_id()."' LIMIT 1"; //Adding limit 1 just in case
 
         $sql_track = 'SELECT * FROM '.$track_exercises.$condition;
 
         $result = Database::query($sql_track);
         $new_array = array();
-        if (Database::num_rows($result) > 0 ) {
+        if (Database::num_rows($result) > 0) {
             $new_array = Database::fetch_array($result, 'ASSOC');
             $new_array['num_exe'] = Database::num_rows($result);
         }
@@ -2892,12 +2892,12 @@ 
         $questionList = array_map('intval', $questionList);
 
         $params = array(
-            'exe_exo_id' => $this->id ,
+            'exe_exo_id' => $this->id,
             'exe_user_id' => api_get_user_id(),
             'c_id' => api_get_course_int_id(),
             'status' =>  'incomplete',
             'session_id'  => api_get_session_id(),
-            'data_tracking'  => implode(',', $questionList) ,
+            'data_tracking'  => implode(',', $questionList),
             'start_date' => api_get_utc_datetime(),
             'orig_lp_id' => $safe_lp_id,
             'orig_lp_item_id'  => $safe_lp_item_id,
@@ -2929,7 +2929,7 @@ 
         $nbrQuestions = $this->get_count_question_list();
 
         $all_button = $html = $label = '';
-        $hotspot_get = isset($_POST['hotspot']) ? Security::remove_XSS($_POST['hotspot']):null;
+        $hotspot_get = isset($_POST['hotspot']) ? Security::remove_XSS($_POST['hotspot']) : null;
 
         if ($this->selectFeedbackType() == EXERCISE_FEEDBACK_TYPE_DIRECT && $this->type == ONE_PER_PAGE) {
             $urlTitle = get_lang('ContinueTest');
@@ -2940,7 +2940,7 @@ 
 
             $html .= Display::url(
                 $urlTitle,
-                'exercise_submit_modal.php?' . http_build_query([
+                'exercise_submit_modal.php?'.http_build_query([
                     'learnpath_id' => $safe_lp_id,
                     'learnpath_item_id' => $safe_lp_item_id,
                     'learnpath_item_view_id' => $safe_lp_item_view_id,
@@ -2957,7 +2957,7 @@ 
                     'data-size' => 'md'
                 ]
             );
-            $html .='<br />';
+            $html .= '<br />';
         } else {
             // User
             if (api_is_allowed_to_session_edit()) {
@@ -2982,7 +2982,7 @@ 
 
                     //Next question
                     if (!empty($questions_in_media)) {
-                        $questions_in_media = "['".implode("','",$questions_in_media)."']";
+                        $questions_in_media = "['".implode("','", $questions_in_media)."']";
                         $all_button .= '&nbsp;<a href="javascript://" class="'.$class.'" onclick="save_question_list('.$questions_in_media.'); ">'.$label.'</a>';
                     } else {
                         $all_button .= '&nbsp;<a href="javascript://" class="'.$class.'" onclick="save_now('.$question_id.', \'\', \''.$currentAnswer.'\'); ">'.$label.'</a>';
@@ -3000,7 +3000,7 @@ 
                     }
 					$class .= ' question-validate-btn'; // used to select it with jquery
                     $all_button = '&nbsp;<a href="javascript://" class="'.$class.'" onclick="validate_all(); ">'.$all_label.'</a>';
-                    $all_button .= '&nbsp;' . Display::span(null, ['id' => 'save_all_reponse']);
+                    $all_button .= '&nbsp;'.Display::span(null, ['id' => 'save_all_reponse']);
                     $html .= $all_button;
                 }
             }
@@ -3242,8 +3242,8 @@ 
             $params = array();
             $params['course_id'] = $course_id;
             $params['session_id'] = api_get_session_id();
-            $params['user_id'] = isset($exe_info['exe_user_id'])? $exe_info['exe_user_id'] : api_get_user_id();
-            $params['exercise_id'] = isset($exe_info['exe_exo_id'])? $exe_info['exe_exo_id'] : $this->id;
+            $params['user_id'] = isset($exe_info['exe_user_id']) ? $exe_info['exe_user_id'] : api_get_user_id();
+            $params['exercise_id'] = isset($exe_info['exe_exo_id']) ? $exe_info['exe_exo_id'] : $this->id;
             $params['question_id'] = $questionId;
             $params['exe_id'] = isset($exe_info['exe_id']) ? $exe_info['exe_id'] : $exeId;
 
@@ -3297,10 +3297,10 @@ 
             $answer = $objAnswerTmp->selectAnswer($answerId);
             $answerComment = $objAnswerTmp->selectComment($answerId);
             $answerCorrect = $objAnswerTmp->isCorrect($answerId);
-            $answerWeighting = (float)$objAnswerTmp->selectWeighting($answerId);
+            $answerWeighting = (float) $objAnswerTmp->selectWeighting($answerId);
             $answerAutoId = $objAnswerTmp->selectAutoId($answerId);
 
-            $answer_correct_array[$answerId] = (bool)$answerCorrect;
+            $answer_correct_array[$answerId] = (bool) $answerCorrect;
 
             if ($debug) {
                 error_log("answer auto id: $answerAutoId ");
@@ -3309,7 +3309,7 @@ 
 
             // Delineation
             $delineation_cord = $objAnswerTmp->selectHotspotCoordinates(1);
-            $answer_delineation_destination=$objAnswerTmp->selectDestination(1);
+            $answer_delineation_destination = $objAnswerTmp->selectDestination(1);
 
             switch ($answerType) {
                 // for unique answer
@@ -3322,7 +3322,7 @@ 
                                     exe_id = '".$exeId."' AND
                                     question_id= '".$questionId."'";
                         $result = Database::query($sql);
-                        $choice = Database::result($result,0,"answer");
+                        $choice = Database::result($result, 0, "answer");
 
                         $studentChoice = $choice == $answerAutoId ? 1 : 0;
                         if ($studentChoice) {
@@ -3373,7 +3373,7 @@ 
                     } else {
                         // If no result then the user just hit don't know
                         $studentChoice = 3;
-                        $questionScore  +=  $doubt_score;
+                        $questionScore += $doubt_score;
                     }
                     $totalScore = $questionScore;
                     break;
@@ -3389,17 +3389,17 @@ 
                         }
 
                         $studentChoice = isset($choice[$answerAutoId]) ? $choice[$answerAutoId] : null;
-                        $real_answers[$answerId] = (bool)$studentChoice;
+                        $real_answers[$answerId] = (bool) $studentChoice;
 
                         if ($studentChoice) {
-                            $questionScore  +=$answerWeighting;
+                            $questionScore += $answerWeighting;
                         }
                     } else {
                         $studentChoice = isset($choice[$answerAutoId]) ? $choice[$answerAutoId] : null;
-                        $real_answers[$answerId] = (bool)$studentChoice;
+                        $real_answers[$answerId] = (bool) $studentChoice;
 
                         if (isset($studentChoice)) {
-                            $questionScore  += $answerWeighting;
+                            $questionScore += $answerWeighting;
                         }
                     }
                     $totalScore += $answerWeighting;
@@ -3417,16 +3417,16 @@ 
                             $choice[$ind] = 1;
                         }
                         $studentChoice = isset($choice[$answerAutoId]) ? $choice[$answerAutoId] : null;
-                        $real_answers[$answerId] = (bool)$studentChoice;
+                        $real_answers[$answerId] = (bool) $studentChoice;
                         if ($studentChoice) {
-                            $questionScore +=$answerWeighting;
+                            $questionScore += $answerWeighting;
                         }
                     } else {
                         $studentChoice = isset($choice[$answerAutoId]) ? $choice[$answerAutoId] : null;
                         if (isset($studentChoice)) {
                             $questionScore += $answerWeighting;
                         }
-                        $real_answers[$answerId] = (bool)$studentChoice;
+                        $real_answers[$answerId] = (bool) $studentChoice;
                     }
                     $totalScore += $answerWeighting;
                     if ($debug) error_log("studentChoice: $studentChoice");
@@ -3438,7 +3438,7 @@ 
                         $resultans = Database::query($sql);
                         while ($row = Database::fetch_array($resultans)) {
                             $ind = $row['answer'];
-                            $result = explode(':',$ind);
+                            $result = explode(':', $ind);
                             if (isset($result[0])) {
                                 $my_answer_id = isset($result[0]) ? $result[0] : '';
                                 $option = isset($result[1]) ? $result[1] : '';
@@ -3559,10 +3559,10 @@ 
                             }
                             // adds the piece of text that is before the blank
                             //and ends with '[' into a general storage array
-                            $real_text[] = api_substr($temp, 0, $pos +1);
-                            $answer .= api_substr($temp, 0, $pos +1);
+                            $real_text[] = api_substr($temp, 0, $pos + 1);
+                            $answer .= api_substr($temp, 0, $pos + 1);
                             //take the string remaining (after the last "[" we found)
-                            $temp = api_substr($temp, $pos +1);
+                            $temp = api_substr($temp, $pos + 1);
                             // quit the loop if there are no more blanks, and update $pos to the position of next ']'
                             if (($pos = api_strpos($temp, ']')) === false) {
                                 // adds the end of the text
@@ -3598,7 +3598,7 @@ 
                             //put the contents of the [] answer tag into correct_tags[]
                             $correct_tags[] = api_substr($temp, 0, $pos);
                             $j++;
-                            $temp = api_substr($temp, $pos +1);
+                            $temp = api_substr($temp, $pos + 1);
                         }
                         $answer = '';
                         $real_correct_tags = $correct_tags;
@@ -3621,7 +3621,7 @@ 
                                 } elseif (!empty($user_tags[$i])) {
                                     // else if the word entered by the student IS NOT the same as the one defined by the professor
                                     // adds the word in red at the end of the string, and strikes it
-                                    $answer .= '<font color="red"><s>' . $user_tags[$i] . '</s></font>';
+                                    $answer .= '<font color="red"><s>'.$user_tags[$i].'</s></font>';
                                 } else {
                                     // adds a tabulation if no word has been typed by the student
                                     $answer .= ''; // remove &nbsp; that causes issue
@@ -3640,17 +3640,17 @@ 
                                 } elseif (!empty ($user_tags[$i])) {
                                     // else if the word entered by the student IS NOT the same as the one defined by the professor
                                     // adds the word in red at the end of the string, and strikes it
-                                    $answer .= '<font color="red"><s>' . $user_tags[$i] . '</s></font>';
+                                    $answer .= '<font color="red"><s>'.$user_tags[$i].'</s></font>';
                                 } else {
                                     // adds a tabulation if no word has been typed by the student
-                                    $answer .= '';  // remove &nbsp; that causes issue
+                                    $answer .= ''; // remove &nbsp; that causes issue
                                 }
                             }
 
                             // adds the correct word, followed by ] to close the blank
-                            $answer .= ' / <font color="green"><b>' . $real_correct_tags[$i] . '</b></font>]';
-                            if (isset($real_text[$i +1])) {
-                                $answer .= $real_text[$i +1];
+                            $answer .= ' / <font color="green"><b>'.$real_correct_tags[$i].'</b></font>]';
+                            if (isset($real_text[$i + 1])) {
+                                $answer .= $real_text[$i + 1];
                             }
                         }
                     } else {
@@ -3791,10 +3791,10 @@ 
                         }
                         // adds the piece of text that is before the blank
                         //and ends with '[' into a general storage array
-                        $realText[] = api_substr($temp, 0, $pos +1);
-                        $answer .= api_substr($temp, 0, $pos +1);
+                        $realText[] = api_substr($temp, 0, $pos + 1);
+                        $answer .= api_substr($temp, 0, $pos + 1);
                         //take the string remaining (after the last "[" we found)
-                        $temp = api_substr($temp, $pos +1);
+                        $temp = api_substr($temp, $pos + 1);
                         // quit the loop if there are no more blanks, and update $pos to the position of next ']'
                         if (($pos = api_strpos($temp, ']')) === false) {
                             // adds the end of the text
@@ -3828,7 +3828,7 @@ 
                         //put the contents of the [] answer tag into correct_tags[]
                         $correctTags[] = api_substr($temp, 0, $pos);
                         $j++;
-                        $temp = api_substr($temp, $pos +1);
+                        $temp = api_substr($temp, $pos + 1);
                     }
                     $answer = '';
                     $realCorrectTags = $correctTags;
@@ -3858,22 +3858,22 @@ 
                         } elseif (!empty($userTags[$i])) {
                             // else if the word entered by the student IS NOT the same as the one defined by the professor
                             // adds the word in red at the end of the string, and strikes it
-                            $answer .= '<font color="red"><s>' . $userTags[$i] . '</s></font>';
+                            $answer .= '<font color="red"><s>'.$userTags[$i].'</s></font>';
                         } else {
                             // adds a tabulation if no word has been typed by the student
                             $answer .= ''; // remove &nbsp; that causes issue
                         }
                         // adds the correct word, followed by ] to close the blank
-                        $answer .= ' / <font color="green"><b>' . $realCorrectTags[$i] . '</b></font>]';
-                        if (isset($realText[$i +1])) {
-                            $answer .= $realText[$i +1];
+                        $answer .= ' / <font color="green"><b>'.$realCorrectTags[$i].'</b></font>]';
+                        if (isset($realText[$i + 1])) {
+                            $answer .= $realText[$i + 1];
                         }
                     }
                     break;
                 // for free answer
                 case FREE_ANSWER:
                     if ($from_database) {
-                        $query  = "SELECT answer, marks FROM ".$TBL_TRACK_ATTEMPT."
+                        $query = "SELECT answer, marks FROM ".$TBL_TRACK_ATTEMPT."
                                    WHERE exe_id = '".$exeId."' AND question_id= '".$questionId."'";
                         $resq = Database::query($query);
                         $data = Database::fetch_array($resq);
@@ -3884,9 +3884,9 @@ 
                         $questionScore = $data['marks'];
 
                         if ($questionScore == -1) {
-                            $totalScore+= 0;
+                            $totalScore += 0;
                         } else {
-                            $totalScore+= $questionScore;
+                            $totalScore += $questionScore;
                         }
                         if ($questionScore == '') {
                             $questionScore = 0;
@@ -3907,14 +3907,14 @@ 
                         $query  = "SELECT answer, marks FROM ".$TBL_TRACK_ATTEMPT."
                                    WHERE exe_id = '".$exeId."' AND question_id= '".$questionId."'";
                         $resq   = Database::query($query);
-                        $choice = Database::result($resq,0,'answer');
+                        $choice = Database::result($resq, 0, 'answer');
                         $choice = str_replace('\r\n', '', $choice);
                         $choice = stripslashes($choice);
-                        $questionScore = Database::result($resq,0,"marks");
-                        if ($questionScore==-1) {
-                            $totalScore+=0;
+                        $questionScore = Database::result($resq, 0, "marks");
+                        if ($questionScore == -1) {
+                            $totalScore += 0;
                         } else {
-                            $totalScore+=$questionScore;
+                            $totalScore += $questionScore;
                         }
                         $arrques = $questionName;
                         $arrans  = $choice;
@@ -3959,7 +3959,7 @@ 
 
                         while ($a_answers = Database::fetch_array($res_answers)) {
                             $i_answer_id = $a_answers['id']; //3
-                            $s_answer_label = $a_answers['answer'];  // your daddy - your mother
+                            $s_answer_label = $a_answers['answer']; // your daddy - your mother
                             $i_answer_correct_answer = $a_answers['correct']; //1 - 2
                             $i_answer_id_auto = $a_answers['id_auto']; // 3 - 4
 
@@ -4011,8 +4011,8 @@ 
 
                             if ($show_result) {
                                 echo '<tr>';
-                                echo '<td>' . $s_answer_label . '</td>';
-                                echo '<td>' . $user_answer;
+                                echo '<td>'.$s_answer_label.'</td>';
+                                echo '<td>'.$user_answer;
 
                                 if (in_array($answerType, [MATCHING, MATCHING_DRAGGABLE])) {
                                     if (isset($real_list[$i_answer_correct_answer])) {
@@ -4121,7 +4121,7 @@ 
                     if ($from_database) {
                         // getting the user answer
                         $TBL_TRACK_HOTSPOT = Database::get_main_table(TABLE_STATISTIC_TRACK_E_HOTSPOT);
-                        $query   = "SELECT hotspot_correct, hotspot_coordinate
+                        $query = "SELECT hotspot_correct, hotspot_coordinate
                                     FROM $TBL_TRACK_HOTSPOT
                                     WHERE
                                         hotspot_exe_id = '".$exeId."' AND
@@ -4129,20 +4129,20 @@ 
                                         hotspot_answer_id='1'";
                         //by default we take 1 because it's a delineation
                         $resq = Database::query($query);
-                        $row = Database::fetch_array($resq,'ASSOC');
+                        $row = Database::fetch_array($resq, 'ASSOC');
 
                         $choice = $row['hotspot_correct'];
                         $user_answer = $row['hotspot_coordinate'];
 
                         // THIS is very important otherwise the poly_compile will throw an error!!
                         // round-up the coordinates
-                        $coords = explode('/',$user_answer);
+                        $coords = explode('/', $user_answer);
                         $user_array = '';
                         foreach ($coords as $coord) {
-                            list($x,$y) = explode(';',$coord);
+                            list($x, $y) = explode(';', $coord);
                             $user_array .= round($x).';'.round($y).'/';
                         }
-                        $user_array = substr($user_array,0,-1);
+                        $user_array = substr($user_array, 0, -1);
                     } else {
                         if (!empty($studentChoice)) {
                             $newquestionList[] = $questionId;
@@ -4152,13 +4152,13 @@ 
                             $studentChoice = $choice[$answerId];
                             $questionScore += $answerWeighting;
 
-                            if ($hotspot_delineation_result[1]==1) {
+                            if ($hotspot_delineation_result[1] == 1) {
                                 $totalScore += $answerWeighting; //adding the total
                             }
                         }
                     }
-                    $_SESSION['hotspot_coord'][1]	= $delineation_cord;
-                    $_SESSION['hotspot_dest'][1]	= $answer_delineation_destination;
+                    $_SESSION['hotspot_coord'][1] = $delineation_cord;
+                    $_SESSION['hotspot_dest'][1] = $answer_delineation_destination;
                     break;
             } // end switch Answertype
 
@@ -4216,7 +4216,7 @@ 
                                 $results_disabled
                             );
                             //}
-                        } elseif ($answerType == MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE ) {
+                        } elseif ($answerType == MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE) {
                             //	if ($origin!='learnpath') {
                             ExerciseShowFunctions::display_multiple_answer_combination_true_false(
                                 $feedback_type,
@@ -4233,11 +4233,11 @@ 
                             //}
                         } elseif ($answerType == FILL_IN_BLANKS) {
                             //if ($origin!='learnpath') {
-                            ExerciseShowFunctions::display_fill_in_blanks_answer($feedback_type, $answer,0,0, $results_disabled);
+                            ExerciseShowFunctions::display_fill_in_blanks_answer($feedback_type, $answer, 0, 0, $results_disabled);
                             //	}
                         } elseif ($answerType == CALCULATED_ANSWER) {
                             //if ($origin!='learnpath') {
-                            ExerciseShowFunctions::display_calculated_answer($feedback_type, $answer,0,0);
+                            ExerciseShowFunctions::display_calculated_answer($feedback_type, $answer, 0, 0);
                             //  }
                         } elseif ($answerType == FREE_ANSWER) {
                             //if($origin != 'learnpath') {
@@ -4291,13 +4291,13 @@ 
                             $user_answer = $_SESSION['exerciseResultCoordinates'][$questionId];
 
                             //round-up the coordinates
-                            $coords = explode('/',$user_answer);
+                            $coords = explode('/', $user_answer);
                             $user_array = '';
                             foreach ($coords as $coord) {
-                                list($x,$y) = explode(';',$coord);
+                                list($x, $y) = explode(';', $coord);
                                 $user_array .= round($x).';'.round($y).'/';
                             }
-                            $user_array = substr($user_array,0,-1);
+                            $user_array = substr($user_array, 0, -1);
 
                             if ($next) {
 
@@ -4324,7 +4324,7 @@ 
                                 //$overlap = round(polygons_overlap($poly_answer,$poly_user));
                                 // //this is an area in pixels
                                 if ($debug > 0) {
-                                    error_log(__LINE__ . ' - Polygons results are ' . print_r($poly_results, 1), 0);
+                                    error_log(__LINE__.' - Polygons results are '.print_r($poly_results, 1), 0);
                                 }
 
                                 if ($overlap < 1) {
@@ -4337,43 +4337,43 @@ 
                                     // that is overlapped by the user's polygon
                                     $final_overlap = round(((float) $overlap / (float) $poly_answer_area) * 100);
                                     if ($debug > 1) {
-                                        error_log(__LINE__ . ' - Final overlap is ' . $final_overlap, 0);
+                                        error_log(__LINE__.' - Final overlap is '.$final_overlap, 0);
                                     }
                                     // the final missing area is the percentage of the initial polygon
                                     // that is not overlapped by the user's polygon
                                     $final_missing = 100 - $final_overlap;
                                     if ($debug > 1) {
-                                        error_log(__LINE__ . ' - Final missing is ' . $final_missing, 0);
+                                        error_log(__LINE__.' - Final missing is '.$final_missing, 0);
                                     }
                                     // the final excess area is the percentage of the initial polygon's size
                                     // that is covered by the user's polygon outside of the initial polygon
                                     $final_excess = round((((float) $poly_user_area - (float) $overlap) / (float) $poly_answer_area) * 100);
                                     if ($debug > 1) {
-                                        error_log(__LINE__ . ' - Final excess is ' . $final_excess, 0);
+                                        error_log(__LINE__.' - Final excess is '.$final_excess, 0);
                                     }
                                 }
 
                                 //checking the destination parameters parsing the "@@"
-                                $destination_items= explode('@@', $answerDestination);
+                                $destination_items = explode('@@', $answerDestination);
                                 $threadhold_total = $destination_items[0];
-                                $threadhold_items=explode(';',$threadhold_total);
+                                $threadhold_items = explode(';', $threadhold_total);
                                 $threadhold1 = $threadhold_items[0]; // overlap
                                 $threadhold2 = $threadhold_items[1]; // excess
-                                $threadhold3 = $threadhold_items[2];	 //missing
+                                $threadhold3 = $threadhold_items[2]; //missing
 
                                 // if is delineation
-                                if ($answerId===1) {
+                                if ($answerId === 1) {
                                     //setting colors
-                                    if ($final_overlap>=$threadhold1) {
-                                        $overlap_color=true; //echo 'a';
+                                    if ($final_overlap >= $threadhold1) {
+                                        $overlap_color = true; //echo 'a';
                                     }
                                     //echo $excess.'-'.$threadhold2;
-                                    if ($final_excess<=$threadhold2) {
-                                        $excess_color=true; //echo 'b';
+                                    if ($final_excess <= $threadhold2) {
+                                        $excess_color = true; //echo 'b';
                                     }
                                     //echo '--------'.$missing.'-'.$threadhold3;
-                                    if ($final_missing<=$threadhold3) {
-                                        $missing_color=true; //echo 'c';
+                                    if ($final_missing <= $threadhold3) {
+                                        $missing_color = true; //echo 'c';
                                     }
 
                                     // if pass
@@ -4382,67 +4382,67 @@ 
                                         $final_missing <= $threadhold3 &&
                                         $final_excess <= $threadhold2
                                     ) {
-                                        $next=1; //go to the oars
-                                        $result_comment=get_lang('Acceptable');
-                                        $final_answer = 1;	// do not update with  update_exercise_attempt
+                                        $next = 1; //go to the oars
+                                        $result_comment = get_lang('Acceptable');
+                                        $final_answer = 1; // do not update with  update_exercise_attempt
                                     } else {
-                                        $next=0;
-                                        $result_comment=get_lang('Unacceptable');
-                                        $comment=$answerDestination=$objAnswerTmp->selectComment(1);
-                                        $answerDestination=$objAnswerTmp->selectDestination(1);
+                                        $next = 0;
+                                        $result_comment = get_lang('Unacceptable');
+                                        $comment = $answerDestination = $objAnswerTmp->selectComment(1);
+                                        $answerDestination = $objAnswerTmp->selectDestination(1);
                                         //checking the destination parameters parsing the "@@"
-                                        $destination_items= explode('@@', $answerDestination);
+                                        $destination_items = explode('@@', $answerDestination);
                                     }
-                                } elseif($answerId>1) {
+                                } elseif ($answerId > 1) {
                                     if ($objAnswerTmp->selectHotspotType($answerId) == 'noerror') {
-                                        if ($debug>0) {
-                                            error_log(__LINE__.' - answerId is of type noerror',0);
+                                        if ($debug > 0) {
+                                            error_log(__LINE__.' - answerId is of type noerror', 0);
                                         }
                                         //type no error shouldn't be treated
                                         $next = 1;
                                         continue;
                                     }
-                                    if ($debug>0) {
-                                        error_log(__LINE__.' - answerId is >1 so we\'re probably in OAR',0);
+                                    if ($debug > 0) {
+                                        error_log(__LINE__.' - answerId is >1 so we\'re probably in OAR', 0);
                                     }
                                     //check the intersection between the oar and the user
                                     //echo 'user';	print_r($x_user_list);		print_r($y_user_list);
                                     //echo 'official';print_r($x_list);print_r($y_list);
                                     //$result = get_intersection_data($x_list,$y_list,$x_user_list,$y_user_list);
-                                    $inter= $result['success'];
+                                    $inter = $result['success'];
 
                                     //$delineation_cord=$objAnswerTmp->selectHotspotCoordinates($answerId);
-                                    $delineation_cord=$objAnswerTmp->selectHotspotCoordinates($answerId);
+                                    $delineation_cord = $objAnswerTmp->selectHotspotCoordinates($answerId);
 
-                                    $poly_answer = convert_coordinates($delineation_cord,'|');
-                                    $max_coord = poly_get_max($poly_user,$poly_answer);
-                                    $poly_answer_compiled = poly_compile($poly_answer,$max_coord);
-                                    $overlap = poly_touch($poly_user_compiled, $poly_answer_compiled,$max_coord);
+                                    $poly_answer = convert_coordinates($delineation_cord, '|');
+                                    $max_coord = poly_get_max($poly_user, $poly_answer);
+                                    $poly_answer_compiled = poly_compile($poly_answer, $max_coord);
+                                    $overlap = poly_touch($poly_user_compiled, $poly_answer_compiled, $max_coord);
 
                                     if ($overlap == false) {
                                         //all good, no overlap
                                         $next = 1;
                                         continue;
                                     } else {
-                                        if ($debug>0) {
-                                            error_log(__LINE__.' - Overlap is '.$overlap.': OAR hit',0);
+                                        if ($debug > 0) {
+                                            error_log(__LINE__.' - Overlap is '.$overlap.': OAR hit', 0);
                                         }
                                         $organs_at_risk_hit++;
                                         //show the feedback
-                                        $next=0;
-                                        $comment=$answerDestination=$objAnswerTmp->selectComment($answerId);
-                                        $answerDestination=$objAnswerTmp->selectDestination($answerId);
-
-                                        $destination_items= explode('@@', $answerDestination);
-                                        $try_hotspot=$destination_items[1];
-                                        $lp_hotspot=$destination_items[2];
-                                        $select_question_hotspot=$destination_items[3];
-                                        $url_hotspot=$destination_items[4];
+                                        $next = 0;
+                                        $comment = $answerDestination = $objAnswerTmp->selectComment($answerId);
+                                        $answerDestination = $objAnswerTmp->selectDestination($answerId);
+
+                                        $destination_items = explode('@@', $answerDestination);
+                                        $try_hotspot = $destination_items[1];
+                                        $lp_hotspot = $destination_items[2];
+                                        $select_question_hotspot = $destination_items[3];
+                                        $url_hotspot = $destination_items[4];
                                     }
                                 }
                             } else {	// the first delineation feedback
-                                if ($debug>0) {
-                                    error_log(__LINE__.' first',0);
+                                if ($debug > 0) {
+                                    error_log(__LINE__.' first', 0);
                                 }
                             }
                         } elseif (in_array($answerType, [MATCHING, MATCHING_DRAGGABLE])) {
@@ -4450,7 +4450,7 @@ 
                             echo Display::tag('td', $answerMatching[$answerId]);
                             echo Display::tag(
                                 'td',
-                                "$user_answer / " . Display::tag(
+                                "$user_answer / ".Display::tag(
                                     'strong',
                                     $answerMatching[$answerCorrect],
                                     ['style' => 'color: #008000; font-weight: bold;']
@@ -4590,7 +4590,7 @@ 
                                     $exeId,
                                     $questionId,
                                     $nano
-                                ) . '</td>
+                                ).'</td>
                                 </tr>
                                 </table>';
                             break;
@@ -4649,7 +4649,7 @@ 
 
                                 //$overlap = round(polygons_overlap($poly_answer,$poly_user)); //this is an area in pixels
                                 if ($debug > 0) {
-                                    error_log(__LINE__ . ' - Polygons results are ' . print_r($poly_results, 1), 0);
+                                    error_log(__LINE__.' - Polygons results are '.print_r($poly_results, 1), 0);
                                 }
                                 if ($overlap < 1) {
                                     //shortcut to avoid complicated calculations
@@ -4660,17 +4660,17 @@ 
                                     // the final overlap is the percentage of the initial polygon that is overlapped by the user's polygon
                                     $final_overlap = round(((float) $overlap / (float) $poly_answer_area) * 100);
                                     if ($debug > 1) {
-                                        error_log(__LINE__ . ' - Final overlap is ' . $final_overlap, 0);
+                                        error_log(__LINE__.' - Final overlap is '.$final_overlap, 0);
                                     }
                                     // the final missing area is the percentage of the initial polygon that is not overlapped by the user's polygon
                                     $final_missing = 100 - $final_overlap;
                                     if ($debug > 1) {
-                                        error_log(__LINE__ . ' - Final missing is ' . $final_missing, 0);
+                                        error_log(__LINE__.' - Final missing is '.$final_missing, 0);
                                     }
                                     // the final excess area is the percentage of the initial polygon's size that is covered by the user's polygon outside of the initial polygon
                                     $final_excess = round((((float) $poly_user_area - (float) $overlap) / (float) $poly_answer_area) * 100);
                                     if ($debug > 1) {
-                                        error_log(__LINE__ . ' - Final excess is ' . $final_excess, 0);
+                                        error_log(__LINE__.' - Final excess is '.$final_excess, 0);
                                     }
                                 }
 
@@ -4680,7 +4680,7 @@ 
                                 $threadhold_items = explode(';', $threadhold_total);
                                 $threadhold1 = $threadhold_items[0]; // overlap
                                 $threadhold2 = $threadhold_items[1]; // excess
-                                $threadhold3 = $threadhold_items[2];  //missing
+                                $threadhold3 = $threadhold_items[2]; //missing
                                 // if is delineation
                                 if ($answerId === 1) {
                                     //setting colors
@@ -4712,14 +4712,14 @@ 
                                 } elseif ($answerId > 1) {
                                     if ($objAnswerTmp->selectHotspotType($answerId) == 'noerror') {
                                         if ($debug > 0) {
-                                            error_log(__LINE__ . ' - answerId is of type noerror', 0);
+                                            error_log(__LINE__.' - answerId is of type noerror', 0);
                                         }
                                         //type no error shouldn't be treated
                                         $next = 1;
                                         continue;
                                     }
                                     if ($debug > 0) {
-                                        error_log(__LINE__ . ' - answerId is >1 so we\'re probably in OAR', 0);
+                                        error_log(__LINE__.' - answerId is >1 so we\'re probably in OAR', 0);
                                     }
                                     //check the intersection between the oar and the user
                                     //echo 'user';	print_r($x_user_list);		print_r($y_user_list);
@@ -4733,7 +4733,7 @@ 
                                     $poly_answer = convert_coordinates($delineation_cord, '|');
                                     $max_coord = poly_get_max($poly_user, $poly_answer);
                                     $poly_answer_compiled = poly_compile($poly_answer, $max_coord);
-                                    $overlap = poly_touch($poly_user_compiled, $poly_answer_compiled,$max_coord);
+                                    $overlap = poly_touch($poly_user_compiled, $poly_answer_compiled, $max_coord);
 
                                     if ($overlap == false) {
                                         //all good, no overlap
@@ -4741,7 +4741,7 @@ 
                                         continue;
                                     } else {
                                         if ($debug > 0) {
-                                            error_log(__LINE__ . ' - Overlap is ' . $overlap . ': OAR hit', 0);
+                                            error_log(__LINE__.' - Overlap is '.$overlap.': OAR hit', 0);
                                         }
                                         $organs_at_risk_hit++;
                                         //show the feedback
@@ -4753,12 +4753,12 @@ 
                                         $try_hotspot = $destination_items[1];
                                         $lp_hotspot = $destination_items[2];
                                         $select_question_hotspot = $destination_items[3];
-                                        $url_hotspot=$destination_items[4];
+                                        $url_hotspot = $destination_items[4];
                                     }
                                 }
                             } else {	// the first delineation feedback
                                 if ($debug > 0) {
-                                    error_log(__LINE__ . ' first', 0);
+                                    error_log(__LINE__.' first', 0);
                                 }
                             }
                             break;
@@ -4780,7 +4780,7 @@ 
                             echo Display::tag('td', $answerMatching[$answerId]);
                             echo Display::tag(
                                 'td',
-                                "$user_answer / " . Display::tag(
+                                "$user_answer / ".Display::tag(
                                     'strong',
                                     $answerMatching[$answerCorrect],
                                     ['style' => 'color: #008000; font-weight: bold;']
@@ -4866,7 +4866,7 @@ 
             //  we use the results from the session (from_db=0)
             // TODO Change this, because it is wrong to show the user
             //  some results that haven't been stored in the database yet
-            if ($answerType == HOT_SPOT || $answerType == HOT_SPOT_ORDER || $answerType == HOT_SPOT_DELINEATION ) {
+            if ($answerType == HOT_SPOT || $answerType == HOT_SPOT_ORDER || $answerType == HOT_SPOT_DELINEATION) {
 
                 if ($debug) error_log('$from AND this is a hotspot kind of question ');
 
@@ -4875,19 +4875,19 @@ 
                 if ($answerType == HOT_SPOT_DELINEATION) {
                     if (0) {
                         if ($overlap_color) {
-                            $overlap_color='green';
+                            $overlap_color = 'green';
                         } else {
-                            $overlap_color='red';
+                            $overlap_color = 'red';
                         }
                         if ($missing_color) {
-                            $missing_color='green';
+                            $missing_color = 'green';
                         } else {
-                            $missing_color='red';
+                            $missing_color = 'red';
                         }
                         if ($excess_color) {
-                            $excess_color='green';
+                            $excess_color = 'green';
                         } else {
-                            $excess_color='red';
+                            $excess_color = 'red';
                         }
                         if (!is_numeric($final_overlap)) {
                             $final_overlap = 0;
@@ -4899,33 +4899,33 @@ 
                             $final_excess = 0;
                         }
 
-                        if ($final_overlap>100) {
+                        if ($final_overlap > 100) {
                             $final_overlap = 100;
                         }
 
-                        $table_resume='<table class="data_table">
+                        $table_resume = '<table class="data_table">
                                 <tr class="row_odd" >
                                     <td></td>
-                                    <td ><b>' . get_lang('Requirements') . '</b></td>
-                                    <td><b>' . get_lang('YourAnswer') . '</b></td>
+                                    <td ><b>' . get_lang('Requirements').'</b></td>
+                                    <td><b>' . get_lang('YourAnswer').'</b></td>
                                 </tr>
                                 <tr class="row_even">
-                                    <td><b>' . get_lang('Overlap') . '</b></td>
-                                    <td>' . get_lang('Min') . ' ' . $threadhold1 . '</td>
-                                    <td><div style="color:' . $overlap_color . '">'
-                                        . (($final_overlap < 0) ? 0 : intval($final_overlap)) . '</div></td>
+                                    <td><b>' . get_lang('Overlap').'</b></td>
+                                    <td>' . get_lang('Min').' '.$threadhold1.'</td>
+                                    <td><div style="color:' . $overlap_color.'">'
+                                        . (($final_overlap < 0) ? 0 : intval($final_overlap)).'</div></td>
                                 </tr>
                                 <tr>
-                                    <td><b>' . get_lang('Excess') . '</b></td>
-                                    <td>' . get_lang('Max') . ' ' . $threadhold2 . '</td>
-                                    <td><div style="color:' . $excess_color . '">'
-                                        . (($final_excess < 0) ? 0 : intval($final_excess)) . '</div></td>
+                                    <td><b>' . get_lang('Excess').'</b></td>
+                                    <td>' . get_lang('Max').' '.$threadhold2.'</td>
+                                    <td><div style="color:' . $excess_color.'">'
+                                        . (($final_excess < 0) ? 0 : intval($final_excess)).'</div></td>
                                 </tr>
                                 <tr class="row_even">
-                                    <td><b>' . get_lang('Missing') . '</b></td>
-                                    <td>' . get_lang('Max') . ' ' . $threadhold3 . '</td>
-                                    <td><div style="color:' . $missing_color . '">'
-                                        . (($final_missing < 0) ? 0 : intval($final_missing)) . '</div></td>
+                                    <td><b>' . get_lang('Missing').'</b></td>
+                                    <td>' . get_lang('Max').' '.$threadhold3.'</td>
+                                    <td><div style="color:' . $missing_color.'">'
+                                        . (($final_missing < 0) ? 0 : intval($final_missing)).'</div></td>
                                 </tr>
                             </table>';
                         if ($next == 0) {
@@ -4940,20 +4940,20 @@ 
                             $answerDestination = $objAnswerTmp->selectDestination($nbrAnswers);
                         }
 
-                        echo '<h1><div style="color:#333;">' . get_lang('Feedback') . '</div></h1>
+                        echo '<h1><div style="color:#333;">'.get_lang('Feedback').'</div></h1>
                             <p style="text-align:center">';
 
-                        $message = '<p>' . get_lang('YourDelineation') . '</p>';
+                        $message = '<p>'.get_lang('YourDelineation').'</p>';
                         $message .= $table_resume;
-                        $message .= '<br />' . get_lang('ResultIs') . ' ' . $result_comment . '<br />';
+                        $message .= '<br />'.get_lang('ResultIs').' '.$result_comment.'<br />';
                         if ($organs_at_risk_hit > 0) {
-                            $message .= '<p><b>' . get_lang('OARHit') . '</b></p>';
+                            $message .= '<p><b>'.get_lang('OARHit').'</b></p>';
                         }
-                        $message .='<p>' . $comment . '</p>';
+                        $message .= '<p>'.$comment.'</p>';
                         echo $message;
                     } else {
                         echo $hotspot_delineation_result[0]; //prints message
-                        $from_database = 1;  // the hotspot_solution.swf needs this variable
+                        $from_database = 1; // the hotspot_solution.swf needs this variable
                     }
 
                     //save the score attempts
@@ -4975,20 +4975,20 @@ 
                             $exerciseResultCoordinates[$quesId]
                         );
                     } else {
-                        if ($final_answer==0) {
+                        if ($final_answer == 0) {
                             $questionScore = 0;
-                            $answer=0;
+                            $answer = 0;
                             Event::saveQuestionAttempt($questionScore, $answer, $quesId, $exeId, 0);
                             if (is_array($exerciseResultCoordinates[$quesId])) {
-                                foreach($exerciseResultCoordinates[$quesId] as $idx => $val) {
-                                    Event::saveExerciseAttemptHotspot($exeId,$quesId,$idx,0,$val);
+                                foreach ($exerciseResultCoordinates[$quesId] as $idx => $val) {
+                                    Event::saveExerciseAttemptHotspot($exeId, $quesId, $idx, 0, $val);
                                 }
                             }
                         } else {
                             Event::saveQuestionAttempt($questionScore, $answer, $quesId, $exeId, 0);
                             if (is_array($exerciseResultCoordinates[$quesId])) {
-                                foreach($exerciseResultCoordinates[$quesId] as $idx => $val) {
-                                    Event::saveExerciseAttemptHotspot($exeId,$quesId,$idx,$choice[$idx],$val);
+                                foreach ($exerciseResultCoordinates[$quesId] as $idx => $val) {
+                                    Event::saveExerciseAttemptHotspot($exeId, $quesId, $idx, $choice[$idx], $val);
                                 }
                             }
                         }
@@ -5007,7 +5007,7 @@ 
                     echo "
                         <tr>
                             <td colspan=\"2\">
-                                <p><em>" . get_lang('HotSpot') . "</em></p>
+                                <p><em>" . get_lang('HotSpot')."</em></p>
 
                                 <div id=\"hotspot-solution-$questionId\"></div>
 
@@ -5045,7 +5045,7 @@ 
 
         if ($saved_results) {
             if ($debug) error_log("Save question results $saved_results");
-            if ($debug) error_log(print_r($choice ,1 ));
+            if ($debug) error_log(print_r($choice, 1));
 
             if (empty($choice)) {
                 $choice = 0;
@@ -5057,14 +5057,14 @@ 
                         $ans = $reply[$i];
                         Event::saveQuestionAttempt(
                             $questionScore,
-                            $ans . ':' . $choice[$ans],
+                            $ans.':'.$choice[$ans],
                             $quesId,
                             $exeId,
                             $i,
                             $this->id
                         );
                         if ($debug) {
-                            error_log('result =>' . $questionScore . ' ' . $ans . ':' . $choice[$ans]);
+                            error_log('result =>'.$questionScore.' '.$ans.':'.$choice[$ans]);
                         }
                     }
                 } else {
@@ -5075,7 +5075,7 @@ 
                     $reply = array_keys($choice);
 
                     if ($debug) {
-                        error_log("reply " . print_r($reply, 1) . "");
+                        error_log("reply ".print_r($reply, 1)."");
                     }
                     for ($i = 0; $i < sizeof($reply); $i++) {
                         $ans = $reply[$i];
@@ -5134,7 +5134,7 @@ 
 
                 Event::saveQuestionAttempt($questionScore, implode('|', $answer), $quesId, $exeId, 0, $this->id);
             } else {
-                Event::saveQuestionAttempt($questionScore, $answer, $quesId, $exeId, 0,$this->id);
+                Event::saveQuestionAttempt($questionScore, $answer, $quesId, $exeId, 0, $this->id);
             }
         }
 
@@ -5144,8 +5144,8 @@ 
 
         if ($saved_results) {
             $stat_table = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
-            $sql = 'UPDATE ' . $stat_table . ' SET
-                        exe_result = exe_result + ' . floatval($questionScore) . '
+            $sql = 'UPDATE '.$stat_table.' SET
+                        exe_result = exe_result + ' . floatval($questionScore).'
                     WHERE exe_id = ' . $exeId;
             if ($debug) error_log($sql);
             Database::query($sql);
@@ -5169,7 +5169,7 @@ 
      */
     public function send_mail_notification_for_exam($question_list_answers, $origin, $exe_id)
     {
-        if (api_get_course_setting('email_alert_manager_on_new_quiz') != 1 ) {
+        if (api_get_course_setting('email_alert_manager_on_new_quiz') != 1) {
             return null;
         }
         // Email configuration settings
@@ -5220,7 +5220,7 @@ 
         $msg = str_replace("#course#", $courseInfo['name'], $msg1);
 
         if ($origin != 'learnpath') {
-            $msg.= '<br /><a href="#url#">'.get_lang('ClickToCommentAndGiveFeedback').'</a>';
+            $msg .= '<br /><a href="#url#">'.get_lang('ClickToCommentAndGiveFeedback').'</a>';
         }
         $msg1 = str_replace("#url#", $url_email, $msg);
         $mail_content = $msg1;
@@ -5249,7 +5249,7 @@ 
      */
     function send_notification_for_open_questions($question_list_answers, $origin, $exe_id)
     {
-        if (api_get_course_setting('email_alert_manager_on_new_quiz') != 1 ) {
+        if (api_get_course_setting('email_alert_manager_on_new_quiz') != 1) {
             return null;
         }
         // Email configuration settings
@@ -5312,11 +5312,11 @@ 
             $msg .= '</table><br />';
 
 
-            $msg1   = str_replace("#exercise#",    $this->exercise, $msg);
-            $msg    = str_replace("#firstName#",   $user_info['firstname'],$msg1);
-            $msg1   = str_replace("#lastName#",    $user_info['lastname'],$msg);
-            $msg    = str_replace("#mail#",        $user_info['email'],$msg1);
-            $msg    = str_replace("#course#",      $course_info['name'],$msg1);
+            $msg1   = str_replace("#exercise#", $this->exercise, $msg);
+            $msg    = str_replace("#firstName#", $user_info['firstname'], $msg1);
+            $msg1   = str_replace("#lastName#", $user_info['lastname'], $msg);
+            $msg    = str_replace("#mail#", $user_info['email'], $msg1);
+            $msg    = str_replace("#course#", $course_info['name'], $msg1);
 
             if ($origin != 'learnpath') {
                 $msg .= '<br /><a href="#url#">'.get_lang('ClickToCommentAndGiveFeedback').'</a>';
@@ -5345,7 +5345,7 @@ 
 
     function send_notification_for_oral_questions($question_list_answers, $origin, $exe_id)
     {
-        if (api_get_course_setting('email_alert_manager_on_new_quiz') != 1 ) {
+        if (api_get_course_setting('email_alert_manager_on_new_quiz') != 1) {
             return null;
         }
         // Email configuration settings
@@ -5369,7 +5369,7 @@ 
             $answer_type = $item['answer_type'];
 
             if (!empty($question) && !empty($answer) && $answer_type == ORAL_EXPRESSION) {
-                $oral_question_list.='<br /><table width="730" height="136" border="0" cellpadding="3" cellspacing="3">'
+                $oral_question_list .= '<br /><table width="730" height="136" border="0" cellpadding="3" cellspacing="3">'
                     .'<tr>'
                         .'<td width="220" valign="top" bgcolor="#E5EDF8">&nbsp;&nbsp;'.get_lang('Question').'</td>'
                         .'<td width="473" valign="top" bgcolor="#F3F3F3">'.$question.'</td>'
@@ -5402,7 +5402,7 @@ 
                             .'<td>&nbsp;#mail#</td>'
                         .'</tr>'
                     .'</table>';
-            $msg .=  '<br />'.sprintf(get_lang('OralQuestionsAttemptedAreX'),$oral_question_list).'<br />';
+            $msg .= '<br />'.sprintf(get_lang('OralQuestionsAttemptedAreX'), $oral_question_list).'<br />';
             $msg1 = str_replace("#exercise#", $this->exercise, $msg);
             $msg = str_replace("#firstName#", $user_info['firstname'], $msg1);
             $msg1 = str_replace("#lastName#", $user_info['lastname'], $msg);
@@ -5410,7 +5410,7 @@ 
             $msg = str_replace("#course#", $course_info['name'], $msg1);
 
             if ($origin != 'learnpath') {
-                $msg.= '<br /><a href="#url#">'.get_lang('ClickToCommentAndGiveFeedback').'</a>';
+                $msg .= '<br /><a href="#url#">'.get_lang('ClickToCommentAndGiveFeedback').'</a>';
             }
             $msg1 = str_replace("#url#", $url_email, $msg);
             $mail_content = $msg1;
@@ -5476,10 +5476,10 @@ 
         }
         $html  = '<div class="question-result">';
         $html .= Display::page_header(
-            Display::return_icon('test-quiz.png', get_lang('Result'),null, ICON_SIZE_MEDIUM).' '.$this->exercise.' : '.get_lang('Result')
+            Display::return_icon('test-quiz.png', get_lang('Result'), null, ICON_SIZE_MEDIUM).' '.$this->exercise.' : '.get_lang('Result')
         );
         $html .= Display::description($array);
-        $html .="</div>";
+        $html .= "</div>";
         return $html;
     }
 
@@ -5596,7 +5596,7 @@ 
                     false,
                     $objExercise->selectPropagateNeg()
                 );
-                $totalScore      += $question_result['score'];
+                $totalScore += $question_result['score'];
             }
 
             if ($objExercise->selectPropagateNeg() == 0 && $totalScore < 0) {
@@ -5802,7 +5802,7 @@ 
         }
 
         $rawMessage = "";
-        if (!empty($message)){
+        if (!empty($message)) {
             $rawMessage = $message;
             $message = Display::return_message($message, 'warning', false);
         }
@@ -5818,7 +5818,7 @@ 
     {
         $TBL_LP_ITEM = Database::get_course_table(TABLE_LP_ITEM);
         $sql = "SELECT max_score FROM $TBL_LP_ITEM
-            WHERE c_id = {$this->course_id} AND item_type = '" . TOOL_QUIZ . "' AND path = '{$this->id}'";
+            WHERE c_id = {$this->course_id} AND item_type = '".TOOL_QUIZ."' AND path = '{$this->id}'";
         $result = Database::query($sql);
         if (Database::num_rows($result) > 0) {
             return true;
@@ -6146,7 +6146,7 @@ 
         $sql_track = "SELECT * FROM $track_exercises WHERE exe_id = $exe_id ";
         $result = Database::query($sql_track);
         $new_array = array();
-        if (Database::num_rows($result) > 0 ) {
+        if (Database::num_rows($result) > 0) {
             $new_array = Database::fetch_array($result, 'ASSOC');
 
             $new_array['duration'] = null;
@@ -6158,11 +6158,11 @@ 
                 $start_date = api_strtotime($start_date, 'UTC');
                 $end_date = api_strtotime($end_date, 'UTC');
                 if ($start_date && $end_date) {
-                    $mytime = $end_date- $start_date;
+                    $mytime = $end_date - $start_date;
                     $new_learnpath_item = new learnpathItem(null);
                     $time_attemp = $new_learnpath_item->get_scorm_time('js', $mytime);
                     $h = get_lang('h');
-                    $time_attemp = str_replace('NaN', '00' . $h . '00\'00"', $time_attemp);
+                    $time_attemp = str_replace('NaN', '00'.$h.'00\'00"', $time_attemp);
                     $new_array['duration'] = $time_attemp;
                 }
             }
@@ -6184,7 +6184,7 @@ 
                     $result = Database::query($sql);
                 }
             } else {
-                $remind_list = explode(',',$exercise_info['questions_to_check']);
+                $remind_list = explode(',', $exercise_info['questions_to_check']);
 
                 $remind_list_string = '';
                 if ($action == 'add') {
@@ -6196,7 +6196,7 @@ 
                         }
                         $remind_list_string = implode(',', $remind_list);
                     }
-                } elseif ($action == 'delete')  {
+                } elseif ($action == 'delete') {
                     if (!empty($remind_list)) {
                         if (in_array($question_id, $remind_list)) {
                             $remind_list = array_flip($remind_list);
@@ -6438,7 +6438,7 @@ 
                     true
                 );
 
-                $counter += count($mediaQuestions[$questionId]) - 1 ;
+                $counter += count($mediaQuestions[$questionId]) - 1;
                 $before = count($questionList);
                 $wasMedia = true;
                 $nextValue += count($questionList);
@@ -6517,7 +6517,7 @@ 
                         // If it was already seen, then merge the previous with
                         // the current category
                         $oldQuestionList = $newCategoryList[$rootElement]['question_list'];
-                        $category['question_list'] = array_merge($oldQuestionList , $category['question_list']);
+                        $category['question_list'] = array_merge($oldQuestionList, $category['question_list']);
                         $newCategoryList[$rootElement] = $category;
                     }
                 }
@@ -6543,7 +6543,7 @@ 
 
                 if ($useRootAsCategoryTitle) {
                     if (isset($category['parent_info'])) {
-                        $categoryName  = $category['parent_info']['title'];
+                        $categoryName = $category['parent_info']['title'];
                     }
                 }
                 $html .= '<div class="row">';
@@ -6686,7 +6686,7 @@ 
         // end foreach()
 
         if ($this->type == ALL_ON_ONE_PAGE) {
-            $exercise_actions =  $this->show_button($questionId, $currentQuestion);
+            $exercise_actions = $this->show_button($questionId, $currentQuestion);
             echo Display::div($exercise_actions, array('class'=>'exercise_actions'));
         }
     }
@@ -6772,7 +6772,7 @@ 
 
             // Showing the question
 
-            $exercise_actions  = null;
+            $exercise_actions = null;
 
             echo '<a id="questionanchor'.$questionId.'"></a><br />';
             echo '<div id="question_div_'.$questionId.'" class="main_question '.$remind_highlight.'" >';
@@ -7040,7 +7040,7 @@ 
                         $header .= Display::tag('th', get_lang('Feedback'));
                     }
                     $s .= '<table class="data_table">';
-                    $s.= Display::tag('tr', $header, array('style' => 'text-align:left;'));
+                    $s .= Display::tag('tr', $header, array('style' => 'text-align:left;'));
                 }
             }
 
@@ -7140,7 +7140,7 @@ 
                             $s .= '<td>';
                             $s .= $comment;
                             $s .= '</td>';
-                            $s .='</tr>';
+                            $s .= '</tr>';
                         } else {
                             $s .= $answer_input;
                         }
@@ -7154,7 +7154,7 @@ 
                             }
                         }
 
-                        $s .='<tr>';
+                        $s .= '<tr>';
                         $s .= Display::tag('td', $answer);
 
                         if (!empty($quiz_question_options)) {
@@ -7181,7 +7181,7 @@ 
                             $s .= $comment;
                             $s .= '</td>';
                         }
-                        $s.='</tr>';
+                        $s .= '</tr>';
                     }
 
                 } elseif ($answerType == MULTIPLE_ANSWER_COMBINATION) {
@@ -7210,16 +7210,16 @@ 
                     $answer_input .= '</label>';
 
                     if ($show_comment) {
-                        $s.= '<tr>';
+                        $s .= '<tr>';
                         $s .= '<td>';
-                        $s.= $answer_input;
+                        $s .= $answer_input;
                         $s .= '</td>';
                         $s .= '<td>';
                         $s .= $comment;
                         $s .= '</td>';
-                        $s.= '</tr>';
+                        $s .= '</tr>';
                     } else {
-                        $s.= $answer_input;
+                        $s .= $answer_input;
                     }
                 } elseif ($answerType == MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE) {
                     $s .= '<input type="hidden" name="choice2['.$questionId.']" value="0" />';
@@ -7232,7 +7232,7 @@ 
                         }
                     }
                     $answer = Security::remove_XSS($answer);
-                    $s .='<tr>';
+                    $s .= '<tr>';
                     $s .= Display::tag('td', $answer);
 
                     foreach ($objQuestionTmp->options as $key => $item) {
@@ -7256,7 +7256,7 @@ 
                         $s .= $comment;
                         $s .= '</td>';
                     }
-                    $s.='</tr>';
+                    $s .= '</tr>';
                 } elseif ($answerType == FILL_IN_BLANKS) {
                     list($answer) = explode('::', $answer);
 
@@ -7290,7 +7290,7 @@ 
                                     $value = str_replace('&nbsp;', '', trim($value[0]));
                                 }
                                 $correct_item = preg_quote($correct_item);
-                                $correct_item = api_preg_replace('|/|', '\/', $correct_item);   // to prevent error if there is a / in the text to find
+                                $correct_item = api_preg_replace('|/|', '\/', $correct_item); // to prevent error if there is a / in the text to find
                                 $answer = api_preg_replace('/'.$correct_item.'/', Display::input('text', "choice[$questionId][]", $value), $answer, 1);
                             }
                             $i++;
@@ -7347,7 +7347,7 @@ 
                         }
 
                         if (!empty($answerCorrect) && !empty($selectedValue)) {
-                            $s.= '<script>
+                            $s .= '<script>
                                 jsPlumb.ready(function() {
                                     jsPlumb.connect({
                                         source: "window_'.$windowId.'",
@@ -7362,14 +7362,14 @@ 
                         }
                         $s .= '</select></div></td>';
 
-                        $s.='<td width="45%" valign="top" >';
+                        $s .= '<td width="45%" valign="top" >';
 
                         if (isset($select_items[$lines_count])) {
-                            $s.= '<div id="window_'.$windowId.'_answer" class="window window_right_question">
+                            $s .= '<div id="window_'.$windowId.'_answer" class="window window_right_question">
                                     <b>'.$select_items[$lines_count]['letter'].'.</b> '.$select_items[$lines_count]['answer'].'
                                   </div>';
                         } else {
-                            $s.='&nbsp;';
+                            $s .= '&nbsp;';
                         }
 
                         $s .= '</td>';
@@ -7383,16 +7383,16 @@ 
                                 $s .= '<tr>
                                       <td colspan="2"></td>
                                       <td valign="top">';
-                                $s.='<b>'.$select_items[$lines_count]['letter'].'.</b>';
+                                $s .= '<b>'.$select_items[$lines_count]['letter'].'.</b>';
                                 $s .= $select_items[$lines_count]['answer'];
-                                $s.="</td>
+                                $s .= "</td>
                                 </tr>";
                                 $lines_count++;
                             } // end while()
                         }  // end if()
                         $matching_correct_answer++;
                     }
-                } elseif ($answerType ==  DRAGGABLE) {
+                } elseif ($answerType == DRAGGABLE) {
                     // matching type, showing suggestions and answers
                     // TODO: replace $answerId by $numAnswer
 
@@ -7435,7 +7435,7 @@ 
                         $s .= '</select>';
 
                         if (!empty($answerCorrect) && !empty($selectedValue)) {
-                            $s.= '<script>
+                            $s .= '<script>
                                 $(function() {
                                     deleteItem($("#'.$questionId.'_'.$selectedValue.'"), $("#drop_'.$windowId.'"));
                                 });
@@ -7444,11 +7444,11 @@ 
 
 
                         if (isset($select_items[$lines_count])) {
-                            $s.= '<div id="window_'.$windowId.'_answer" class="">
+                            $s .= '<div id="window_'.$windowId.'_answer" class="">
                                     <b>'.$select_items[$lines_count]['letter'].'.</b> '.$select_items[$lines_count]['answer'].'
                                   </div>';
                         } else {
-                            $s.='&nbsp;';
+                            $s .= '&nbsp;';
                         }
                         $lines_count++;
                         //if the left side of the "matching" has been completely
@@ -7457,7 +7457,7 @@ 
                         if (($lines_count - 1) == $num_suggestions) {
                             // if it remains answers to shown at the right side
                             while (isset($select_items[$lines_count])) {
-                                $s.='<b>'.$select_items[$lines_count]['letter'].'.</b>';
+                                $s .= '<b>'.$select_items[$lines_count]['letter'].'.</b>';
                                 $s .= $select_items[$lines_count]['answer'];
                                 $lines_count++;
                             }
@@ -7560,9 +7560,9 @@ 
 
             if (!$only_questions) {
                 if ($show_title) {
-                    $html .=  TestCategory::getCategoryNamesForQuestion($objQuestionTmp->id);
-                    $html .=  '<div class="question_title">'.$current_item.'. '.$questionName.'</div>';
-                    $html .=  $questionDescription;
+                    $html .= TestCategory::getCategoryNamesForQuestion($objQuestionTmp->id);
+                    $html .= '<div class="question_title">'.$current_item.'. '.$questionName.'</div>';
+                    $html .= $questionDescription;
                 } else {
                     $html .= '<div class="media">';
                     $html .= '<div class="pull-left">';
@@ -7578,11 +7578,11 @@ 
                     $html .= '</div>';
                 }
                 //@todo I need to the get the feedback type
-                $html .=  '<input type="hidden" name="hidden_hotspot_id" value="'.$questionId.'" />';
-                $html .=  '<table class="exercise_questions">
+                $html .= '<input type="hidden" name="hidden_hotspot_id" value="'.$questionId.'" />';
+                $html .= '<table class="exercise_questions">
                            <tr>
                             <td valign="top" colspan="2">';
-                $html .=  '</td></tr>';
+                $html .= '</td></tr>';
             }
 
             $canClick = isset($_GET['editQuestion']) ? '0' : (isset($_GET['modifyAnswers']) ? '0' : '1');

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

Indentation +4 added lines, -4 removed lines

@@ -45,7 +45,7 @@ 
 }
 
 if (!$is_allowedToEdit) {
-   // api_not_allowed();
+    // api_not_allowed();
 }
 
 if (!empty($_REQUEST['path'])) {
@@ -190,9 +190,9 @@ 
         get_lang('Actions')
     );
 
-  // Column config
-  // @todo fix search firstname/lastname that doesn't work. rmove search for the moment
-	$column_model   = array(
+    // 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'),

main/exercice/hotspot.inc.php

Indentation +6 added lines, -6 removed lines

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

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

Indentation +1 added lines, -1 removed lines

@@ -249,7 +249,7 @@
             break;
         case RESULT_DISABLE_SHOW_SCORE_ONLY:
             if ($objExercise->feedback_type != EXERCISE_FEEDBACK_TYPE_END) {
-               $header_names = array(get_lang('Attempt'), get_lang('StartDate'), get_lang('IP'), get_lang('Score'));
+                $header_names = array(get_lang('Attempt'), get_lang('StartDate'), get_lang('IP'), get_lang('Score'));
             }
             else {
                 $header_names = array(get_lang('Attempt'), get_lang('StartDate'), get_lang('IP'), get_lang('Score'), get_lang('Details'));

Braces +1 added lines, -2 removed lines

@@ -250,8 +250,7 @@
         case RESULT_DISABLE_SHOW_SCORE_ONLY:
             if ($objExercise->feedback_type != EXERCISE_FEEDBACK_TYPE_END) {
                $header_names = array(get_lang('Attempt'), get_lang('StartDate'), get_lang('IP'), get_lang('Score'));
-            }
-            else {
+            } else {
                 $header_names = array(get_lang('Attempt'), get_lang('StartDate'), get_lang('IP'), get_lang('Score'), get_lang('Details'));
             }
             break;

Spacing +11 added lines, -11 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) {
@@ -171,7 +171,7 @@ 
 
 $blockShowAnswers = false;
 if ($objExercise->results_disabled == RESULT_DISABLE_SHOW_SCORE_ATTEMPT_SHOW_ANSWERS_LAST_ATTEMPT) {
-    if (count($attempts) < $objExercise->attempts ) {
+    if (count($attempts) < $objExercise->attempts) {
         $blockShowAnswers = true;
     }
 }
@@ -184,8 +184,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']
         ]);
@@ -195,7 +195,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'
             ]
@@ -213,7 +213,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,
@@ -304,12 +304,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;
@@ -329,7 +329,7 @@ 
     $table_content,
     ['class' => 'table-responsive']
 );
-$html.= '</div>';
+$html .= '</div>';
 echo $html;
 
 Display::display_footer();

main/exercice/multiple_answer_combination.class.php

Indentation +4 added lines, -4 removed lines

@@ -178,9 +178,9 @@ 
     }
 
     /**
-	 * abstract function which creates the form to create/edit the answers of the question
-	 * @param FormValidator $form
-	 */
+     * abstract function which creates the form to create/edit the answers of the question
+     * @param FormValidator $form
+     */
     public function processAnswersCreation($form)
     {
         $questionWeighting = $nbrGoodAnswers = 0;
@@ -221,7 +221,7 @@ 
         // sets the total weighting of the question
         $this->updateWeighting($questionWeighting);
         $this->save();
-	}
+    }
 
     function return_header($feedback_type = null, $counter = null, $score = null)
     {

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>

main/exercice/live_stats.php

Indentation +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 $result = $objExercise->read($exercise_id);
 
 if (!$result) {
-	api_not_allowed(true);
+    api_not_allowed(true);
 }
 
 $interbreadcrumb[] = array(

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