chamilo / chamilo-lms

main/blog/download.php

Indentation +7 added lines, -7 removed lines

@@ -33,18 +33,18 @@
 $doc_url = str_replace('/..', '', $doc_url); //echo $doc_url;
 
 if (! isset($_course)) {
-	api_not_allowed(true);
+    api_not_allowed(true);
 }
 $full_file_name = api_get_path(SYS_COURSE_PATH).api_get_course_path().'/upload/blog/'.$doc_url;
 
 //if the rewrite rule asks for a directory, we redirect to the course view
 if (is_dir($full_file_name)) {
-	//remove last slash if present
-	while ($doc_url{$dul = strlen($doc_url)-1}=='/') $doc_url = substr($doc_url,0,$dul);
-	//create the path
-	$document_explorer = api_get_path(WEB_COURSE_PATH).api_get_course_path(); // home course path
-	//redirect
-	header('Location: '.$document_explorer);
+    //remove last slash if present
+    while ($doc_url{$dul = strlen($doc_url)-1}=='/') $doc_url = substr($doc_url,0,$dul);
+    //create the path
+    $document_explorer = api_get_path(WEB_COURSE_PATH).api_get_course_path(); // home course path
+    //redirect
+    header('Location: '.$document_explorer);
     exit;
 }
 

Spacing +4 added lines, -4 removed lines

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

Braces +3 added lines, -1 removed lines

@@ -40,7 +40,9 @@
 //if the rewrite rule asks for a directory, we redirect to the course view
 if (is_dir($full_file_name)) {
 	//remove last slash if present
-	while ($doc_url{$dul = strlen($doc_url)-1}=='/') $doc_url = substr($doc_url,0,$dul);
+	while ($doc_url{$dul = strlen($doc_url)-1}=='/') {
+	    $doc_url = substr($doc_url,0,$dul);
+	}
 	//create the path
 	$document_explorer = api_get_path(WEB_COURSE_PATH).api_get_course_path(); // home course path
 	//redirect

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/blog/blog_admin.php

Spacing +15 added lines, -15 removed lines

@@ -8,11 +8,11 @@ 
 */
 
 require_once '../inc/global.inc.php';
-$current_course_tool  = TOOL_BLOGS;
+$current_course_tool = TOOL_BLOGS;
 
 $this_section = SECTION_COURSES;
 
-$blog_table_attachment 	= Database::get_course_table(TABLE_BLOGS_ATTACHMENT);
+$blog_table_attachment = Database::get_course_table(TABLE_BLOGS_ATTACHMENT);
 
 /* 		ACCESS RIGHTS	 */
 // notice for unauthorized people.
@@ -20,7 +20,7 @@ 
 
 //	 ONLY USERS REGISTERED IN THE COURSE
 if ((!$is_allowed_in_course || !$is_courseMember) && !api_is_allowed_to_edit()) {
-    api_not_allowed(true);//print headers/footers
+    api_not_allowed(true); //print headers/footers
 }
 
 if (api_is_allowed_to_edit()) {
@@ -30,30 +30,30 @@ 
     // the learning path, we do not include the banner so we have to explicitly
     // include the stylesheet, which is normally done in the header
     if (empty($_GET['origin']) || $_GET['origin'] != 'learnpath') {
-        $interbreadcrumb[]= array ('url' => 'blog_admin.php?','name' => $nameTools);
-        $my_url='';
-        if (isset($_GET['action']) && $_GET['action']=='add') {
-            $current_section=get_lang('AddBlog');
-            $my_url='action=add';
-        } elseif (isset($_GET['action']) && $_GET['action']=='edit') {
-            $current_section=get_lang('EditBlog');
-            $my_url='action=edit&blog_id='.Security::remove_XSS($_GET['blog_id']);
+        $interbreadcrumb[] = array('url' => 'blog_admin.php?', 'name' => $nameTools);
+        $my_url = '';
+        if (isset($_GET['action']) && $_GET['action'] == 'add') {
+            $current_section = get_lang('AddBlog');
+            $my_url = 'action=add';
+        } elseif (isset($_GET['action']) && $_GET['action'] == 'edit') {
+            $current_section = get_lang('EditBlog');
+            $my_url = 'action=edit&blog_id='.Security::remove_XSS($_GET['blog_id']);
         }
         Display::display_header('');
     }
     echo '<div class="actions">';
     echo "<a href='".api_get_self()."?".api_get_cidreq()."&action=add'>",
-        Display::return_icon('new_blog.png',get_lang('AddBlog'),'',ICON_SIZE_MEDIUM)."</a>";
+        Display::return_icon('new_blog.png', get_lang('AddBlog'), '', ICON_SIZE_MEDIUM)."</a>";
     echo '</div>';
 
     if (!empty($_POST['new_blog_submit']) AND !empty($_POST['blog_name'])) {
-        if (isset($_POST['blog_name']))  {
+        if (isset($_POST['blog_name'])) {
             Blog::create_blog($_POST['blog_name'], $_POST['blog_subtitle']);
             Display::display_confirmation_message(get_lang('BlogStored'));
         }
     }
     if (!empty($_POST['edit_blog_submit']) AND !empty($_POST['blog_name'])) {
-        if (strlen(trim($_POST['blog_name']))>0) {
+        if (strlen(trim($_POST['blog_name'])) > 0) {
             Blog::edit_blog($_POST['blog_id'], $_POST['blog_name'], $_POST['blog_subtitle']);
             Display::display_confirmation_message(get_lang('BlogEdited'));
         }
@@ -94,7 +94,7 @@ 
         // we show the form if
         // 1. no post data
         // 2. there is post data and one of the three form elements is empty
-        if (!$_POST OR (!empty($_POST) AND (empty($_POST['edit_blog_submit']) OR empty($_POST['blog_name']) ))) {
+        if (!$_POST OR (!empty($_POST) AND (empty($_POST['edit_blog_submit']) OR empty($_POST['blog_name'])))) {
             // if there is post data there is certainly an error in the form
             if ($_POST) {
                 Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'));

main/exercice/exercise_report.php

Spacing +3 added lines, -3 removed lines

@@ -246,7 +246,7 @@ 
             Display::addFlash(
                 Display::return_message(get_lang('MessageSent'))
             );
-            header('Location: ' . api_get_path(WEB_PATH));
+            header('Location: '.api_get_path(WEB_PATH));
             exit;
         }
     }
@@ -275,8 +275,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>';

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;
 

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

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

Indentation +11 added lines, -11 removed lines

@@ -1,12 +1,12 @@ 
 <?php
 /* For licensing terms, see /license.txt */
 /**
- *	Hotspot languae conversion
- *	@package chamilo.exercise
- */
+     *	Hotspot languae conversion
+     *	@package chamilo.exercise
+     */
 /**
- * Code
- */
+     * Code
+     */
 session_cache_limiter('none');
 
 $language_file = 'hotspot';
@@ -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;
+    }
 }

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

Spacing +10 added lines, -10 removed lines

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

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;

main/exercice/exercise_show.php

Indentation +152 added lines, -152 removed lines

@@ -92,7 +92,7 @@ 
 $locked = api_resource_is_locked_by_gradebook($exercise_id, LINK_EXERCISE);
 
 if (empty($objExercise)) {
-	$objExercise = new Exercise();
+    $objExercise = new Exercise();
     $objExercise->read($exercise_id);
 }
 $feedback_type = $objExercise->feedback_type;
@@ -100,16 +100,16 @@ 
 //Only users can see their own results
 if (!$is_allowedToEdit) {
     if ($student_id != $current_user_id) {
-    	api_not_allowed(true);
+        api_not_allowed(true);
     }
 }
 
 if (isset($_SESSION['gradebook'])) {
-	$gradebook=	Security::remove_XSS($_SESSION['gradebook']);
+    $gradebook=	Security::remove_XSS($_SESSION['gradebook']);
 }
 
 if (!empty($gradebook) && $gradebook=='view') {
-	$interbreadcrumb[]= array ('url' => '../gradebook/'.$_SESSION['gradebook_dest'],'name' => get_lang('ToolGradebook'));
+    $interbreadcrumb[]= array ('url' => '../gradebook/'.$_SESSION['gradebook_dest'],'name' => get_lang('ToolGradebook'));
 }
 
 $fromlink = '';
@@ -124,14 +124,14 @@ 
 $htmlHeadXtra[] = '<script src="' . api_get_path(WEB_LIBRARY_JS_PATH) . 'hotspot/js/hotspot.js"></script>';
 
 if ($origin != 'learnpath') {
-	Display::display_header('');
+    Display::display_header('');
 } else {
     $htmlHeadXtra[] = "
     <style>
     body { background: none;}
     </style>
     ";
-	Display::display_reduced_header();
+    Display::display_reduced_header();
 }
 ?>
 <script>
@@ -210,12 +210,12 @@ 
         }
     }
 } else {
-	Display::display_warning_message(get_lang('CantViewResults'));
-	$show_results = false;
+    Display::display_warning_message(get_lang('CantViewResults'));
+    $show_results = false;
 }
 
 if ($origin == 'learnpath' && !isset($_GET['fb_type']) ) {
-	$show_results = false;
+    $show_results = false;
 }
 
 if ($show_results || $show_only_total_score) {
@@ -260,13 +260,13 @@ 
 $exerciseResult = array();
 
 while ($row = Database::fetch_array($result)) {
-	$question_list_from_database[] = $row['question_id'];
-	$exerciseResult[$row['question_id']] = $row['answer'];
+    $question_list_from_database[] = $row['question_id'];
+    $exerciseResult[$row['question_id']] = $row['answer'];
 }
 
 //Fixing #2073 Fixing order of questions
 if (!empty($track_exercise_info['data_tracking'])) {
-	$temp_question_list = explode(',', $track_exercise_info['data_tracking']);
+    $temp_question_list = explode(',', $track_exercise_info['data_tracking']);
 
     // Getting question list from data_tracking
     if (!empty($temp_question_list)) {
@@ -306,64 +306,64 @@ 
 
 foreach ($questionList as $questionId) {
 
-	$choice = $exerciseResult[$questionId];
-	// destruction of the Question object
-	unset($objQuestionTmp);
+    $choice = $exerciseResult[$questionId];
+    // destruction of the Question object
+    unset($objQuestionTmp);
 
-	// creates a temporary Question object
-	$objQuestionTmp 	= Question::read($questionId);
-	$questionWeighting	= $objQuestionTmp->selectWeighting();
-	$answerType			= $objQuestionTmp->selectType();
+    // creates a temporary Question object
+    $objQuestionTmp 	= Question::read($questionId);
+    $questionWeighting	= $objQuestionTmp->selectWeighting();
+    $answerType			= $objQuestionTmp->selectType();
 
-	// Start buffer
+    // Start buffer
     ob_start();
 
     /* Use switch
     switch ($answerType) {
     }*/
 
-	if ($answerType == MULTIPLE_ANSWER || $answerType == MULTIPLE_ANSWER_TRUE_FALSE) {
+    if ($answerType == MULTIPLE_ANSWER || $answerType == MULTIPLE_ANSWER_TRUE_FALSE) {
         $question_result = $objExercise->manage_answer($id, $questionId, $choice,'exercise_show', array(), false, true, $show_results, $objExercise->selectPropagateNeg());
         $questionScore   = $question_result['score'];
         $totalScore      += $question_result['score'];
-	} elseif ($answerType == MULTIPLE_ANSWER_COMBINATION || $answerType ==  MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE) {
-		$choice = array();
+    } elseif ($answerType == MULTIPLE_ANSWER_COMBINATION || $answerType ==  MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE) {
+        $choice = array();
+        $question_result = $objExercise->manage_answer($id, $questionId, $choice,'exercise_show', array(), false, true, $show_results, $objExercise->selectPropagateNeg());
+        $questionScore   = $question_result['score'];
+        $totalScore     += $question_result['score'];
+    } elseif ($answerType == UNIQUE_ANSWER || $answerType ==  UNIQUE_ANSWER_NO_OPTION) {
         $question_result = $objExercise->manage_answer($id, $questionId, $choice,'exercise_show', array(), false, true, $show_results, $objExercise->selectPropagateNeg());
         $questionScore   = $question_result['score'];
         $totalScore     += $question_result['score'];
-	} elseif ($answerType == UNIQUE_ANSWER || $answerType ==  UNIQUE_ANSWER_NO_OPTION) {
+        echo '</table>';
+    } elseif ($answerType == FILL_IN_BLANKS) {
         $question_result = $objExercise->manage_answer($id, $questionId, $choice,'exercise_show', array(), false, true, $show_results, $objExercise->selectPropagateNeg());
         $questionScore   = $question_result['score'];
         $totalScore     += $question_result['score'];
-		echo '</table>';
-	} elseif ($answerType == FILL_IN_BLANKS) {
+    } elseif ($answerType == GLOBAL_MULTIPLE_ANSWER) {
         $question_result = $objExercise->manage_answer($id, $questionId, $choice,'exercise_show', array(), false, true, $show_results, $objExercise->selectPropagateNeg());
         $questionScore   = $question_result['score'];
         $totalScore     += $question_result['score'];
-	} elseif ($answerType == GLOBAL_MULTIPLE_ANSWER) {
+    } elseif ($answerType == FREE_ANSWER) {
+        $answer = $str;
         $question_result = $objExercise->manage_answer($id, $questionId, $choice,'exercise_show', array(), false, true, $show_results, $objExercise->selectPropagateNeg());
         $questionScore   = $question_result['score'];
         $totalScore     += $question_result['score'];
-	} elseif ($answerType == FREE_ANSWER) {
+    } elseif ($answerType == ORAL_EXPRESSION) {
         $answer = $str;
         $question_result = $objExercise->manage_answer($id, $questionId, $choice,'exercise_show', array(), false, true, $show_results, $objExercise->selectPropagateNeg());
         $questionScore   = $question_result['score'];
         $totalScore     += $question_result['score'];
-	} elseif ($answerType == ORAL_EXPRESSION) {
-		$answer = $str;
-		$question_result = $objExercise->manage_answer($id, $questionId, $choice,'exercise_show', array(), false, true, $show_results, $objExercise->selectPropagateNeg());
-		$questionScore   = $question_result['score'];
-		$totalScore     += $question_result['score'];
         } elseif (in_array($answerType, [MATCHING, DRAGGABLE, MATCHING_DRAGGABLE])) {
         $question_result = $objExercise->manage_answer($id, $questionId, $choice,'exercise_show', array(), false, true, $show_results, $objExercise->selectPropagateNeg());
         $questionScore   = $question_result['score'];
         $totalScore     += $question_result['score'];
-	} elseif ($answerType == HOT_SPOT) {
-	    if ($show_results) {
-		    echo '<table width="500" border="0"><tr>
+    } elseif ($answerType == HOT_SPOT) {
+        if ($show_results) {
+            echo '<table width="500" border="0"><tr>
                     <td valign="top" align="center" style="padding-left:0px;" >
                         <table border="1" bordercolor="#A4A4A4" style="border-collapse: collapse;" width="552">';
-		}
+        }
         $question_result = $objExercise->manage_answer($id, $questionId, $choice,'exercise_show', array(), false, true, $show_results, $objExercise->selectPropagateNeg());
         $questionScore  = $question_result['score'];
         $totalScore    += $question_result['score'];
@@ -392,7 +392,7 @@ 
                 <br>
             ";
         }
-	} else if($answerType == HOT_SPOT_DELINEATION) {
+    } else if($answerType == HOT_SPOT_DELINEATION) {
 
         $question_result  = $objExercise->manage_answer($id, $questionId, $choice,'exercise_show', array(), false, true, $show_results, $objExercise->selectPropagateNeg(), 'database');
 
@@ -535,15 +535,15 @@ 
                 </table>
             ";
         }
-	}
+    }
 
-	if ($show_results) {
-	    if ($answerType != HOT_SPOT) {
-	        echo '</table>';
-	    }
-	}
+    if ($show_results) {
+        if ($answerType != HOT_SPOT) {
+            echo '</table>';
+        }
+    }
 
-	$comnt = null;
+    $comnt = null;
 
     if ($show_results) {
         if (
@@ -560,40 +560,40 @@ 
 
         $marksname = '';
 
-		if ($isFeedbackAllowed) {
-			$name = "fckdiv".$questionId;
-			$marksname = "marksName".$questionId;
-			if (in_array($answerType, array(FREE_ANSWER, ORAL_EXPRESSION))) {
-				$url_name = get_lang('EditCommentsAndMarks');
-			} else {
-				if ($action=='edit') {
-					$url_name = get_lang('EditIndividualComment');
-				} else {
-					$url_name = get_lang('AddComments');
-				}
-			}
+        if ($isFeedbackAllowed) {
+            $name = "fckdiv".$questionId;
+            $marksname = "marksName".$questionId;
+            if (in_array($answerType, array(FREE_ANSWER, ORAL_EXPRESSION))) {
+                $url_name = get_lang('EditCommentsAndMarks');
+            } else {
+                if ($action=='edit') {
+                    $url_name = get_lang('EditIndividualComment');
+                } else {
+                    $url_name = get_lang('AddComments');
+                }
+            }
             echo '<br />';
             echo Display::url($url_name, 'javascript://', array('class' => 'btn', 'onclick'=>"showfck('".$name."', '".$marksname."');"));
-			echo '<br />';
+            echo '<br />';
 
             echo '<div id="feedback_'.$name.'" style="width:100%">';
-			$comnt = trim(Event::get_comments($id, $questionId));
-			if (empty($comnt)) {
-				echo '<br />';
-			} else {
-				echo '<div id="question_feedback">'.$comnt.'</div>';
-			}
-			echo '</div>';
+            $comnt = trim(Event::get_comments($id, $questionId));
+            if (empty($comnt)) {
+                echo '<br />';
+            } else {
+                echo '<div id="question_feedback">'.$comnt.'</div>';
+            }
+            echo '</div>';
 
             echo '<div id="'.$name.'" style="display:none">';
-			$arrid[] = $questionId;
-			$feedback_form = new FormValidator('frmcomments'.$questionId,'post','');
-			$feedback_form->addElement('html','<br>');
-			$renderer =& $feedback_form->defaultRenderer();
-			$renderer->setFormTemplate('<form{attributes}><div align="left">{content}</div></form>');
-			$renderer->setCustomElementTemplate('<div align="left">{element}</div>');
-			$comnt = Event::get_comments($id, $questionId);
-			$default = array('comments_'.$questionId =>  $comnt);
+            $arrid[] = $questionId;
+            $feedback_form = new FormValidator('frmcomments'.$questionId,'post','');
+            $feedback_form->addElement('html','<br>');
+            $renderer =& $feedback_form->defaultRenderer();
+            $renderer->setFormTemplate('<form{attributes}><div align="left">{content}</div></form>');
+            $renderer->setCustomElementTemplate('<div align="left">{element}</div>');
+            $comnt = Event::get_comments($id, $questionId);
+            $default = array('comments_'.$questionId =>  $comnt);
 
             if ($useAdvancedEditor) {
                 $feedback_form->addElement(
@@ -610,52 +610,52 @@ 
             } else {
                 $feedback_form->addElement('textarea', 'comments_' . $questionId);
             }
-			$feedback_form->addElement('html','<br>');
-			$feedback_form->setDefaults($default);
-			$feedback_form->display();
-			echo '</div>';
-
-		} else {
-			$comnt = Event::get_comments($id, $questionId);
-			echo '<br />';
-			if (!empty($comnt)) {
-				echo '<b>'.get_lang('Feedback').'</b>';
-				echo '<div id="question_feedback">'.$comnt.'</div>';
-			}
-		}
-
-		if ($is_allowedToEdit && $isFeedbackAllowed) {
-			if (in_array($answerType, array(FREE_ANSWER, ORAL_EXPRESSION))) {
-				$marksname = "marksName".$questionId;
+            $feedback_form->addElement('html','<br>');
+            $feedback_form->setDefaults($default);
+            $feedback_form->display();
+            echo '</div>';
+
+        } else {
+            $comnt = Event::get_comments($id, $questionId);
+            echo '<br />';
+            if (!empty($comnt)) {
+                echo '<b>'.get_lang('Feedback').'</b>';
+                echo '<div id="question_feedback">'.$comnt.'</div>';
+            }
+        }
+
+        if ($is_allowedToEdit && $isFeedbackAllowed) {
+            if (in_array($answerType, array(FREE_ANSWER, ORAL_EXPRESSION))) {
+                $marksname = "marksName".$questionId;
                 echo '<div id="'.$marksname.'" style="display:none">';
                 echo '<form name="marksform_'.$questionId.'" method="post" action="">';
-				$arrmarks[] = $questionId;
-				echo get_lang("AssignMarks");
-				echo "&nbsp;<select name='marks' id='marks'>";
-				for ($i=0;$i<=$questionWeighting;$i++) {
-					echo '<option '.(($i==$questionScore)?"selected='selected'":'').'>'.$i.'</option>';
-				}
-				echo '</select>';
-				echo '</form><br /></div>';
-
-				if ($questionScore == -1 ) {
-					$questionScore = 0;
-				  	echo Display::return_message(get_lang('notCorrectedYet'));
-				}
-			} else {
-				$arrmarks[] = $questionId;
-				echo '<div id="'.$marksname.'" style="display:none"><form name="marksform_'.$questionId.'" method="post" action="">
+                $arrmarks[] = $questionId;
+                echo get_lang("AssignMarks");
+                echo "&nbsp;<select name='marks' id='marks'>";
+                for ($i=0;$i<=$questionWeighting;$i++) {
+                    echo '<option '.(($i==$questionScore)?"selected='selected'":'').'>'.$i.'</option>';
+                }
+                echo '</select>';
+                echo '</form><br /></div>';
+
+                if ($questionScore == -1 ) {
+                    $questionScore = 0;
+                        echo Display::return_message(get_lang('notCorrectedYet'));
+                }
+            } else {
+                $arrmarks[] = $questionId;
+                echo '<div id="'.$marksname.'" style="display:none"><form name="marksform_'.$questionId.'" method="post" action="">
 					  <select name="marks" id="marks" style="display:none;"><option>'.$questionScore.'</option></select></form><br/ ></div>';
-			}
-		} else {
-			if ($questionScore == -1) {
-				 $questionScore = 0;
-			}
-		}
-	}
+            }
+        } else {
+            if ($questionScore == -1) {
+                    $questionScore = 0;
+            }
+        }
+    }
 
     $my_total_score  = $questionScore;
-	$my_total_weight = $questionWeighting;
+    $my_total_weight = $questionWeighting;
     $totalWeighting += $questionWeighting;
     $category_was_added_for_this_test = false;
 
@@ -701,7 +701,7 @@ 
 
     $score = array();
     if ($show_results) {
-		$score['result'] = get_lang('Score')." : ".ExerciseLib::show_score($my_total_score, $my_total_weight, false, false);
+        $score['result'] = get_lang('Score')." : ".ExerciseLib::show_score($my_total_score, $my_total_weight, false, false);
         $score['pass']   = $my_total_score >= $my_total_weight ? true : false;
         $score['type']   = $answerType;
         $score['score']  = $my_total_score;
@@ -709,18 +709,18 @@ 
         $score['comments'] = isset($comnt) ? $comnt : null;
     }
 
-	unset($objAnswerTmp);
-	$i++;
+    unset($objAnswerTmp);
+    $i++;
 
     $contents = ob_get_clean();
 
     $question_content = '<div class="question_row">';
 
- 	if ($show_results) {
+        if ($show_results) {
         //Shows question title an description
-	    $question_content .= $objQuestionTmp->return_header(null, $counter, $score);
-	}
-	$counter++;
+        $question_content .= $objQuestionTmp->return_header(null, $counter, $score);
+    }
+    $counter++;
     $question_content .= $contents;
     $question_content .= '</div>';
     $exercise_content .= $question_content;
@@ -730,12 +730,12 @@ 
 
 //Total score
 if ($origin!='learnpath' || ($origin == 'learnpath' && isset($_GET['fb_type']))) {
-	if ($show_results || $show_only_total_score) {
+    if ($show_results || $show_only_total_score) {
         $total_score_text .= '<div class="question_row">';
         $my_total_score_temp = $totalScore;
-	    if ($objExercise->selectPropagateNeg() == 0 && $my_total_score_temp < 0) {
-	        $my_total_score_temp = 0;
-	    }
+        if ($objExercise->selectPropagateNeg() == 0 && $my_total_score_temp < 0) {
+            $my_total_score_temp = 0;
+        }
         $total_score_text .= ExerciseLib::get_question_ribbon(
             $objExercise,
             $my_total_score_temp,
@@ -743,7 +743,7 @@ 
             true
         );
         $total_score_text .= '</div>';
-	}
+    }
 }
 
 if (!empty($category_list) && ($show_results || $show_only_total_score)) {
@@ -767,25 +767,25 @@ 
 }
 
 if ($isFeedbackAllowed) {
-	if (in_array($origin, array('tracking_course','user_course','correct_exercise_in_lp'))) {
-		echo '<form name="myform" id="myform" action="'.api_get_path(WEB_CODE_PATH).'exercice/exercise_report.php?'.api_get_cidreq().'&exerciseId='.$exercise_id.'&filter=2&comments=update&exeid='.$id.'&origin='.$origin.'&details=true&course='.Security::remove_XSS($_GET['cidReq']).$fromlink.'" method="post">';
-		echo '<input type = "hidden" name="lp_item_id"       value="'.$learnpath_id.'">';
-		echo '<input type = "hidden" name="lp_item_view_id"  value="'.$lp_item_view_id.'">';
-		echo '<input type = "hidden" name="student_id"       value="'.$student_id.'">';
-		echo '<input type = "hidden" name="total_score"      value="'.$totalScore.'"> ';
-		echo '<input type = "hidden" name="my_exe_exo_id"    value="'.$exercise_id.'"> ';
-	} else {
-		echo ' <form name="myform" id="myform" action="'.api_get_path(WEB_CODE_PATH).'exercice/exercise_report.php?'.api_get_cidreq().'&exerciseId='.$exercise_id.'&filter=1&comments=update&exeid='.$id.'" method="post">';
-	}
-	if ($origin !='learnpath' && $origin!='student_progress') {
+    if (in_array($origin, array('tracking_course','user_course','correct_exercise_in_lp'))) {
+        echo '<form name="myform" id="myform" action="'.api_get_path(WEB_CODE_PATH).'exercice/exercise_report.php?'.api_get_cidreq().'&exerciseId='.$exercise_id.'&filter=2&comments=update&exeid='.$id.'&origin='.$origin.'&details=true&course='.Security::remove_XSS($_GET['cidReq']).$fromlink.'" method="post">';
+        echo '<input type = "hidden" name="lp_item_id"       value="'.$learnpath_id.'">';
+        echo '<input type = "hidden" name="lp_item_view_id"  value="'.$lp_item_view_id.'">';
+        echo '<input type = "hidden" name="student_id"       value="'.$student_id.'">';
+        echo '<input type = "hidden" name="total_score"      value="'.$totalScore.'"> ';
+        echo '<input type = "hidden" name="my_exe_exo_id"    value="'.$exercise_id.'"> ';
+    } else {
+        echo ' <form name="myform" id="myform" action="'.api_get_path(WEB_CODE_PATH).'exercice/exercise_report.php?'.api_get_cidreq().'&exerciseId='.$exercise_id.'&filter=1&comments=update&exeid='.$id.'" method="post">';
+    }
+    if ($origin !='learnpath' && $origin!='student_progress') {
         echo '<label><input type= "checkbox" name="send_notification"> '.get_lang('SendEmail').'</label>';
-		?>
+        ?>
         <button type="submit" class="btn btn-primary" value="<?php echo get_lang('Ok'); ?>" onclick="getFCK('<?php echo $strids; ?>','<?php echo $marksid; ?>');">
             <?php echo get_lang('CorrectTest'); ?>
         </button>
 		</form>
 		<?php
-	}
+    }
 }
 
 //Came from lpstats in a lp
@@ -802,21 +802,21 @@ 
 }
 
 if ($origin != 'learnpath') {
-	//we are not in learnpath tool
-	Display::display_footer();
+    //we are not in learnpath tool
+    Display::display_footer();
 } else {
-	if (!isset($_GET['fb_type'])) {
-		$lp_mode =  $_SESSION['lp_mode'];
-		$url = '../newscorm/lp_controller.php?'.api_get_cidreq().'&action=view&lp_id='.$learnpath_id.'&lp_item_id='.$learnpath_item_id.'&exeId='.$exeId.'&fb_type='.$feedback_type;
-		$href = ($lp_mode == 'fullscreen')?' window.opener.location.href="'.$url.'" ':' top.location.href="'.$url.'" ';
-		echo '<script type="text/javascript">'.$href.'</script>';
-		// Record the results in the learning path, using the SCORM interface (API)
-		echo "<script>window.parent.API.void_save_asset('$totalScore', '$totalWeighting', 0, 'completed'); </script>";
-		echo '</body></html>';
-	} else {
-		Display::display_normal_message(get_lang('ExerciseFinished').' '.get_lang('ToContinueUseMenu'));
+    if (!isset($_GET['fb_type'])) {
+        $lp_mode =  $_SESSION['lp_mode'];
+        $url = '../newscorm/lp_controller.php?'.api_get_cidreq().'&action=view&lp_id='.$learnpath_id.'&lp_item_id='.$learnpath_item_id.'&exeId='.$exeId.'&fb_type='.$feedback_type;
+        $href = ($lp_mode == 'fullscreen')?' window.opener.location.href="'.$url.'" ':' top.location.href="'.$url.'" ';
+        echo '<script type="text/javascript">'.$href.'</script>';
+        // Record the results in the learning path, using the SCORM interface (API)
+        echo "<script>window.parent.API.void_save_asset('$totalScore', '$totalWeighting', 0, 'completed'); </script>";
+        echo '</body></html>';
+    } else {
+        Display::display_normal_message(get_lang('ExerciseFinished').' '.get_lang('ToContinueUseMenu'));
         echo '<br />';
-	}
+    }
 }
 
 // Destroying the session

Spacing +90 added lines, -90 removed lines

@@ -16,7 +16,7 @@ 
 
 require_once '../inc/global.inc.php';
 $debug = false;
-if (empty($origin) ) {
+if (empty($origin)) {
     $origin = isset($_REQUEST['origin']) ? $_REQUEST['origin'] : null;
 }
 
@@ -30,21 +30,21 @@ 
 $TBL_EXERCISE_QUESTION 	= Database::get_course_table(TABLE_QUIZ_TEST_QUESTION);
 $TBL_QUESTIONS         	= Database::get_course_table(TABLE_QUIZ_QUESTION);
 $TBL_TRACK_EXERCISES    = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
-$TBL_TRACK_ATTEMPT		= Database::get_main_table(TABLE_STATISTIC_TRACK_E_ATTEMPT);
+$TBL_TRACK_ATTEMPT = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ATTEMPT);
 
 // General parameters passed via POST/GET
-if ($debug) { error_log('Entered exercise_result.php: '.print_r($_POST,1)); }
+if ($debug) { error_log('Entered exercise_result.php: '.print_r($_POST, 1)); }
 
 if (empty($formSent)) {            $formSent       = isset($_REQUEST['formSent']) ? $_REQUEST['formSent'] : null; }
 if (empty($exerciseResult)) {      $exerciseResult = isset($_SESSION['exerciseResult']) ? $_SESSION['exerciseResult'] : null; }
-if (empty($questionId)) {          $questionId     = isset($_REQUEST['questionId']) ? $_REQUEST['questionId'] : null;}
-if (empty($choice)) {              $choice         = isset($_REQUEST['choice']) ? $_REQUEST['choice'] : null;}
-if (empty($questionNum)) {         $questionNum    = isset($_REQUEST['num']) ? $_REQUEST['num'] : null;}
-if (empty($nbrQuestions)) {        $nbrQuestions   = isset($_REQUEST['nbrQuestions']) ? $_REQUEST['nbrQuestions'] : null;}
-if (empty($questionList)) {        $questionList   = isset($_SESSION['questionList']) ? $_SESSION['questionList'] : null;}
-if (empty($objExercise)) {         $objExercise    = isset($_SESSION['objExercise']) ? $_SESSION['objExercise'] : null;}
-if (empty($exeId)) {               $exeId          = isset($_REQUEST['id']) ? $_REQUEST['id'] : null;}
-if (empty($action)) {              $action         = isset($_REQUEST['action']) ? $_REQUEST['action'] : null;}
+if (empty($questionId)) {          $questionId     = isset($_REQUEST['questionId']) ? $_REQUEST['questionId'] : null; }
+if (empty($choice)) {              $choice         = isset($_REQUEST['choice']) ? $_REQUEST['choice'] : null; }
+if (empty($questionNum)) {         $questionNum    = isset($_REQUEST['num']) ? $_REQUEST['num'] : null; }
+if (empty($nbrQuestions)) {        $nbrQuestions   = isset($_REQUEST['nbrQuestions']) ? $_REQUEST['nbrQuestions'] : null; }
+if (empty($questionList)) {        $questionList   = isset($_SESSION['questionList']) ? $_SESSION['questionList'] : null; }
+if (empty($objExercise)) {         $objExercise    = isset($_SESSION['objExercise']) ? $_SESSION['objExercise'] : null; }
+if (empty($exeId)) {               $exeId          = isset($_REQUEST['id']) ? $_REQUEST['id'] : null; }
+if (empty($action)) {              $action         = isset($_REQUEST['action']) ? $_REQUEST['action'] : null; }
 
 $id = intval($_REQUEST['id']); //exe id
 
@@ -105,23 +105,23 @@ 
 }
 
 if (isset($_SESSION['gradebook'])) {
-	$gradebook=	Security::remove_XSS($_SESSION['gradebook']);
+	$gradebook = Security::remove_XSS($_SESSION['gradebook']);
 }
 
-if (!empty($gradebook) && $gradebook=='view') {
-	$interbreadcrumb[]= array ('url' => '../gradebook/'.$_SESSION['gradebook_dest'],'name' => get_lang('ToolGradebook'));
+if (!empty($gradebook) && $gradebook == 'view') {
+	$interbreadcrumb[] = array('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('ToolGradebook'));
 }
 
 $fromlink = '';
 
-$interbreadcrumb[]= array("url" => "exercise.php?".api_get_cidreq(),"name" => get_lang('Exercises'));
-$interbreadcrumb[]= array("url" => "overview.php?exerciseId=".$exercise_id.'&'.api_get_cidreq(),"name" => $objExercise->name);
-$interbreadcrumb[]= array("url" => "#","name" => get_lang('Result'));
+$interbreadcrumb[] = array("url" => "exercise.php?".api_get_cidreq(), "name" => get_lang('Exercises'));
+$interbreadcrumb[] = array("url" => "overview.php?exerciseId=".$exercise_id.'&'.api_get_cidreq(), "name" => $objExercise->name);
+$interbreadcrumb[] = array("url" => "#", "name" => get_lang('Result'));
 
 $this_section = SECTION_COURSES;
 
-$htmlHeadXtra[] = '<link rel="stylesheet" href="' . api_get_path(WEB_LIBRARY_JS_PATH) . 'hotspot/css/hotspot.css">';
-$htmlHeadXtra[] = '<script src="' . api_get_path(WEB_LIBRARY_JS_PATH) . 'hotspot/js/hotspot.js"></script>';
+$htmlHeadXtra[] = '<link rel="stylesheet" href="'.api_get_path(WEB_LIBRARY_JS_PATH).'hotspot/css/hotspot.css">';
+$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_JS_PATH).'hotspot/js/hotspot.js"></script>';
 
 if ($origin != 'learnpath') {
 	Display::display_header('');
@@ -178,9 +178,9 @@ 
 // Avoiding the "Score 0/0" message  when the exe_id is not set
 if (!empty($track_exercise_info)) {
     // if the results_disabled of the Quiz is 1 when block the script
-    $result_disabled		= $track_exercise_info['results_disabled'];
+    $result_disabled = $track_exercise_info['results_disabled'];
 
-    if (!(api_is_platform_admin() || api_is_course_admin() || api_is_course_coach()) ) {
+    if (!(api_is_platform_admin() || api_is_course_admin() || api_is_course_coach())) {
         if ($result_disabled == 1) {
             $show_results = false;
             if ($origin != 'learnpath') {
@@ -214,7 +214,7 @@ 
 	$show_results = false;
 }
 
-if ($origin == 'learnpath' && !isset($_GET['fb_type']) ) {
+if ($origin == 'learnpath' && !isset($_GET['fb_type'])) {
 	$show_results = false;
 }
 
@@ -231,12 +231,12 @@ 
 
 $i = $totalScore = $totalWeighting = 0;
 
-if ($debug > 0){error_log("ExerciseResult: ".print_r($exerciseResult,1)); error_log("QuestionList: ".print_r($questionList,1));}
+if ($debug > 0) {error_log("ExerciseResult: ".print_r($exerciseResult, 1)); error_log("QuestionList: ".print_r($questionList, 1)); }
 
 $arrques = array();
 $arrans  = array();
 
-$user_restriction = $is_allowedToEdit ? '' :  "AND user_id=".intval($student_id)." ";
+$user_restriction = $is_allowedToEdit ? '' : "AND user_id=".intval($student_id)." ";
 $sql = "SELECT attempts.question_id, answer
         FROM $TBL_TRACK_ATTEMPT as attempts
         INNER JOIN ".$TBL_TRACK_EXERCISES." AS stats_exercises
@@ -291,7 +291,7 @@ 
 $total_weighting = 0;
 foreach ($questionList as $questionId) {
     $objQuestionTmp = Question::read($questionId);
-    $total_weighting +=$objQuestionTmp->selectWeighting();
+    $total_weighting += $objQuestionTmp->selectWeighting();
 }
 
 $counter = 1;
@@ -311,9 +311,9 @@ 
 	unset($objQuestionTmp);
 
 	// creates a temporary Question object
-	$objQuestionTmp 	= Question::read($questionId);
-	$questionWeighting	= $objQuestionTmp->selectWeighting();
-	$answerType			= $objQuestionTmp->selectType();
+	$objQuestionTmp = Question::read($questionId);
+	$questionWeighting = $objQuestionTmp->selectWeighting();
+	$answerType = $objQuestionTmp->selectType();
 
 	// Start buffer
     ob_start();
@@ -323,39 +323,39 @@ 
     }*/
 
 	if ($answerType == MULTIPLE_ANSWER || $answerType == MULTIPLE_ANSWER_TRUE_FALSE) {
-        $question_result = $objExercise->manage_answer($id, $questionId, $choice,'exercise_show', array(), false, true, $show_results, $objExercise->selectPropagateNeg());
+        $question_result = $objExercise->manage_answer($id, $questionId, $choice, 'exercise_show', array(), false, true, $show_results, $objExercise->selectPropagateNeg());
         $questionScore   = $question_result['score'];
-        $totalScore      += $question_result['score'];
-	} elseif ($answerType == MULTIPLE_ANSWER_COMBINATION || $answerType ==  MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE) {
+        $totalScore += $question_result['score'];
+	} elseif ($answerType == MULTIPLE_ANSWER_COMBINATION || $answerType == MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE) {
 		$choice = array();
-        $question_result = $objExercise->manage_answer($id, $questionId, $choice,'exercise_show', array(), false, true, $show_results, $objExercise->selectPropagateNeg());
+        $question_result = $objExercise->manage_answer($id, $questionId, $choice, 'exercise_show', array(), false, true, $show_results, $objExercise->selectPropagateNeg());
         $questionScore   = $question_result['score'];
         $totalScore     += $question_result['score'];
-	} elseif ($answerType == UNIQUE_ANSWER || $answerType ==  UNIQUE_ANSWER_NO_OPTION) {
-        $question_result = $objExercise->manage_answer($id, $questionId, $choice,'exercise_show', array(), false, true, $show_results, $objExercise->selectPropagateNeg());
+	} elseif ($answerType == UNIQUE_ANSWER || $answerType == UNIQUE_ANSWER_NO_OPTION) {
+        $question_result = $objExercise->manage_answer($id, $questionId, $choice, 'exercise_show', array(), false, true, $show_results, $objExercise->selectPropagateNeg());
         $questionScore   = $question_result['score'];
         $totalScore     += $question_result['score'];
 		echo '</table>';
 	} elseif ($answerType == FILL_IN_BLANKS) {
-        $question_result = $objExercise->manage_answer($id, $questionId, $choice,'exercise_show', array(), false, true, $show_results, $objExercise->selectPropagateNeg());
+        $question_result = $objExercise->manage_answer($id, $questionId, $choice, 'exercise_show', array(), false, true, $show_results, $objExercise->selectPropagateNeg());
         $questionScore   = $question_result['score'];
         $totalScore     += $question_result['score'];
 	} elseif ($answerType == GLOBAL_MULTIPLE_ANSWER) {
-        $question_result = $objExercise->manage_answer($id, $questionId, $choice,'exercise_show', array(), false, true, $show_results, $objExercise->selectPropagateNeg());
+        $question_result = $objExercise->manage_answer($id, $questionId, $choice, 'exercise_show', array(), false, true, $show_results, $objExercise->selectPropagateNeg());
         $questionScore   = $question_result['score'];
         $totalScore     += $question_result['score'];
 	} elseif ($answerType == FREE_ANSWER) {
         $answer = $str;
-        $question_result = $objExercise->manage_answer($id, $questionId, $choice,'exercise_show', array(), false, true, $show_results, $objExercise->selectPropagateNeg());
+        $question_result = $objExercise->manage_answer($id, $questionId, $choice, 'exercise_show', array(), false, true, $show_results, $objExercise->selectPropagateNeg());
         $questionScore   = $question_result['score'];
         $totalScore     += $question_result['score'];
 	} elseif ($answerType == ORAL_EXPRESSION) {
 		$answer = $str;
-		$question_result = $objExercise->manage_answer($id, $questionId, $choice,'exercise_show', array(), false, true, $show_results, $objExercise->selectPropagateNeg());
+		$question_result = $objExercise->manage_answer($id, $questionId, $choice, 'exercise_show', array(), false, true, $show_results, $objExercise->selectPropagateNeg());
 		$questionScore   = $question_result['score'];
 		$totalScore     += $question_result['score'];
         } elseif (in_array($answerType, [MATCHING, DRAGGABLE, MATCHING_DRAGGABLE])) {
-        $question_result = $objExercise->manage_answer($id, $questionId, $choice,'exercise_show', array(), false, true, $show_results, $objExercise->selectPropagateNeg());
+        $question_result = $objExercise->manage_answer($id, $questionId, $choice, 'exercise_show', array(), false, true, $show_results, $objExercise->selectPropagateNeg());
         $questionScore   = $question_result['score'];
         $totalScore     += $question_result['score'];
 	} elseif ($answerType == HOT_SPOT) {
@@ -364,7 +364,7 @@ 
                     <td valign="top" align="center" style="padding-left:0px;" >
                         <table border="1" bordercolor="#A4A4A4" style="border-collapse: collapse;" width="552">';
 		}
-        $question_result = $objExercise->manage_answer($id, $questionId, $choice,'exercise_show', array(), false, true, $show_results, $objExercise->selectPropagateNeg());
+        $question_result = $objExercise->manage_answer($id, $questionId, $choice, 'exercise_show', array(), false, true, $show_results, $objExercise->selectPropagateNeg());
         $questionScore  = $question_result['score'];
         $totalScore    += $question_result['score'];
 
@@ -392,9 +392,9 @@ 
                 <br>
             ";
         }
-	} else if($answerType == HOT_SPOT_DELINEATION) {
+	} else if ($answerType == HOT_SPOT_DELINEATION) {
 
-        $question_result  = $objExercise->manage_answer($id, $questionId, $choice,'exercise_show', array(), false, true, $show_results, $objExercise->selectPropagateNeg(), 'database');
+        $question_result  = $objExercise->manage_answer($id, $questionId, $choice, 'exercise_show', array(), false, true, $show_results, $objExercise->selectPropagateNeg(), 'database');
 
         $questionScore    = $question_result['score'];
         $totalScore      += $question_result['score'];
@@ -414,20 +414,20 @@ 
         if ($show_results) {
 
             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)) {
@@ -441,11 +441,11 @@ 
                 $final_excess = 0;
             }
 
-            if ($final_excess>100) {
+            if ($final_excess > 100) {
                 $final_excess = 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>
@@ -455,38 +455,38 @@ 
             <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><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><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><div style="color:'.$missing_color.'">'.(($final_missing < 0) ? 0 : intval($final_missing)).'</div></td>
             </tr></table>';
 
-            if ($answerType!= HOT_SPOT_DELINEATION) {
-                $item_list = explode('@@',$destination);
+            if ($answerType != HOT_SPOT_DELINEATION) {
+                $item_list = explode('@@', $destination);
 
                 $try = $item_list[0];
                 $lp = $item_list[1];
                 $destinationid = $item_list[2];
                 $url = $item_list[3];
-                $table_resume='';
+                $table_resume = '';
             } else {
-                if ($next==0) {
+                if ($next == 0) {
                     $try = $try_hotspot;
                     $lp = $lp_hotspot;
-                    $destinationid= $select_question_hotspot;
-                    $url=$url_hotspot;
+                    $destinationid = $select_question_hotspot;
+                    $url = $url_hotspot;
                 } else {
                     //show if no error
-                    $comment=$answerComment = $objAnswerTmp->selectComment($nbrAnswers);
+                    $comment = $answerComment = $objAnswerTmp->selectComment($nbrAnswers);
                     $answerDestination = $objAnswerTmp->selectDestination($nbrAnswers);
                 }
             }
@@ -494,14 +494,14 @@ 
             echo '<h1><div style="color:#333;">'.get_lang('Feedback').'</div></h1>';
             if ($answerType == HOT_SPOT_DELINEATION) {
                 if ($organs_at_risk_hit > 0) {
-                    $message='<br />'.get_lang('ResultIs').' <b>'.$result_comment.'</b><br />';
-                    $message.='<p style="color:#DC0A0A;"><b>'.get_lang('OARHit').'</b></p>';
+                    $message = '<br />'.get_lang('ResultIs').' <b>'.$result_comment.'</b><br />';
+                    $message .= '<p style="color:#DC0A0A;"><b>'.get_lang('OARHit').'</b></p>';
                 } else {
-                    $message='<p>'.get_lang('YourDelineation').'</p>';
-                    $message.=$table_resume;
-                    $message.='<br />'.get_lang('ResultIs').' <b>'.$result_comment.'</b><br />';
+                    $message = '<p>'.get_lang('YourDelineation').'</p>';
+                    $message .= $table_resume;
+                    $message .= '<br />'.get_lang('ResultIs').' <b>'.$result_comment.'</b><br />';
                 }
-                $message.='<p>'.$comment.'</p>';
+                $message .= '<p>'.$comment.'</p>';
                 echo $message;
             } else {
                 echo '<p>'.$comment.'</p>';
@@ -510,8 +510,8 @@ 
             //showing the score
             $queryfree = "select marks from ".$TBL_TRACK_ATTEMPT." WHERE exe_id = ".intval($id)." and question_id= ".intval($questionId)."";
             $resfree = Database::query($queryfree);
-            $questionScore= Database::result($resfree,0,"marks");
-            $totalScore+=$questionScore;
+            $questionScore = Database::result($resfree, 0, "marks");
+            $totalScore += $questionScore;
             $relPath = api_get_path(REL_PATH);
             echo '</table></td></tr>';
 
@@ -566,7 +566,7 @@ 
 			if (in_array($answerType, array(FREE_ANSWER, ORAL_EXPRESSION))) {
 				$url_name = get_lang('EditCommentsAndMarks');
 			} else {
-				if ($action=='edit') {
+				if ($action == 'edit') {
 					$url_name = get_lang('EditIndividualComment');
 				} else {
 					$url_name = get_lang('AddComments');
@@ -587,9 +587,9 @@ 
 
             echo '<div id="'.$name.'" style="display:none">';
 			$arrid[] = $questionId;
-			$feedback_form = new FormValidator('frmcomments'.$questionId,'post','');
-			$feedback_form->addElement('html','<br>');
-			$renderer =& $feedback_form->defaultRenderer();
+			$feedback_form = new FormValidator('frmcomments'.$questionId, 'post', '');
+			$feedback_form->addElement('html', '<br>');
+			$renderer = & $feedback_form->defaultRenderer();
 			$renderer->setFormTemplate('<form{attributes}><div align="left">{content}</div></form>');
 			$renderer->setCustomElementTemplate('<div align="left">{element}</div>');
 			$comnt = Event::get_comments($id, $questionId);
@@ -598,7 +598,7 @@ 
             if ($useAdvancedEditor) {
                 $feedback_form->addElement(
                     'html_editor',
-                    'comments_' . $questionId,
+                    'comments_'.$questionId,
                     null,
                     null,
                     array(
@@ -608,9 +608,9 @@ 
                     )
                 );
             } else {
-                $feedback_form->addElement('textarea', 'comments_' . $questionId);
+                $feedback_form->addElement('textarea', 'comments_'.$questionId);
             }
-			$feedback_form->addElement('html','<br>');
+			$feedback_form->addElement('html', '<br>');
 			$feedback_form->setDefaults($default);
 			$feedback_form->display();
 			echo '</div>';
@@ -632,13 +632,13 @@ 
 				$arrmarks[] = $questionId;
 				echo get_lang("AssignMarks");
 				echo "&nbsp;<select name='marks' id='marks'>";
-				for ($i=0;$i<=$questionWeighting;$i++) {
-					echo '<option '.(($i==$questionScore)?"selected='selected'":'').'>'.$i.'</option>';
+				for ($i = 0; $i <= $questionWeighting; $i++) {
+					echo '<option '.(($i == $questionScore) ? "selected='selected'" : '').'>'.$i.'</option>';
 				}
 				echo '</select>';
 				echo '</form><br /></div>';
 
-				if ($questionScore == -1 ) {
+				if ($questionScore == -1) {
 					$questionScore = 0;
 				  	echo Display::return_message(get_lang('notCorrectedYet'));
 				}
@@ -674,7 +674,7 @@ 
     }
 
     if (isset($objQuestionTmp->category_list) && !empty($objQuestionTmp->category_list)) {
-        foreach($objQuestionTmp->category_list as $category_id) {
+        foreach ($objQuestionTmp->category_list as $category_id) {
             $category_list[$category_id]['score'] += $my_total_score;
             $category_list[$category_id]['total'] += $my_total_weight;
             $category_was_added_for_this_test = true;
@@ -729,7 +729,7 @@ 
 $total_score_text = null;
 
 //Total score
-if ($origin!='learnpath' || ($origin == 'learnpath' && isset($_GET['fb_type']))) {
+if ($origin != 'learnpath' || ($origin == 'learnpath' && isset($_GET['fb_type']))) {
 	if ($show_results || $show_only_total_score) {
         $total_score_text .= '<div class="question_row">';
         $my_total_score_temp = $totalScore;
@@ -761,13 +761,13 @@ 
 
 if ($isFeedbackAllowed) {
     if (is_array($arrid) && is_array($arrmarks)) {
-        $strids = implode(",",$arrid);
-        $marksid = implode(",",$arrmarks);
+        $strids = implode(",", $arrid);
+        $marksid = implode(",", $arrmarks);
     }
 }
 
 if ($isFeedbackAllowed) {
-	if (in_array($origin, array('tracking_course','user_course','correct_exercise_in_lp'))) {
+	if (in_array($origin, array('tracking_course', 'user_course', 'correct_exercise_in_lp'))) {
 		echo '<form name="myform" id="myform" action="'.api_get_path(WEB_CODE_PATH).'exercice/exercise_report.php?'.api_get_cidreq().'&exerciseId='.$exercise_id.'&filter=2&comments=update&exeid='.$id.'&origin='.$origin.'&details=true&course='.Security::remove_XSS($_GET['cidReq']).$fromlink.'" method="post">';
 		echo '<input type = "hidden" name="lp_item_id"       value="'.$learnpath_id.'">';
 		echo '<input type = "hidden" name="lp_item_view_id"  value="'.$lp_item_view_id.'">';
@@ -777,7 +777,7 @@ 
 	} else {
 		echo ' <form name="myform" id="myform" action="'.api_get_path(WEB_CODE_PATH).'exercice/exercise_report.php?'.api_get_cidreq().'&exerciseId='.$exercise_id.'&filter=1&comments=update&exeid='.$id.'" method="post">';
 	}
-	if ($origin !='learnpath' && $origin!='student_progress') {
+	if ($origin != 'learnpath' && $origin != 'student_progress') {
         echo '<label><input type= "checkbox" name="send_notification"> '.get_lang('SendEmail').'</label>';
 		?>
         <button type="submit" class="btn btn-primary" value="<?php echo get_lang('Ok'); ?>" onclick="getFCK('<?php echo $strids; ?>','<?php echo $marksid; ?>');">
@@ -789,14 +789,14 @@ 
 }
 
 //Came from lpstats in a lp
-if ($origin =='student_progress') { ?>
+if ($origin == 'student_progress') { ?>
 	<button type="button" class="back" onclick="window.history.go(-1);" value="<?php echo get_lang('Back'); ?>" >
-	<?php echo get_lang('Back');?></button>
+	<?php echo get_lang('Back'); ?></button>
 <?php
-} else if($origin=='myprogress') {
+} else if ($origin == 'myprogress') {
 ?>
 	<button type="button" class="save" onclick="top.location.href='../auth/my_progress.php?course=<?php echo api_get_course_id()?>'" value="<?php echo get_lang('Finish'); ?>" >
-        <?php echo get_lang('Finish');?>
+        <?php echo get_lang('Finish'); ?>
     </button>
 <?php
 }
@@ -806,9 +806,9 @@ 
 	Display::display_footer();
 } else {
 	if (!isset($_GET['fb_type'])) {
-		$lp_mode =  $_SESSION['lp_mode'];
+		$lp_mode = $_SESSION['lp_mode'];
 		$url = '../newscorm/lp_controller.php?'.api_get_cidreq().'&action=view&lp_id='.$learnpath_id.'&lp_item_id='.$learnpath_item_id.'&exeId='.$exeId.'&fb_type='.$feedback_type;
-		$href = ($lp_mode == 'fullscreen')?' window.opener.location.href="'.$url.'" ':' top.location.href="'.$url.'" ';
+		$href = ($lp_mode == 'fullscreen') ? ' window.opener.location.href="'.$url.'" ' : ' top.location.href="'.$url.'" ';
 		echo '<script type="text/javascript">'.$href.'</script>';
 		// Record the results in the learning path, using the SCORM interface (API)
 		echo "<script>window.parent.API.void_save_asset('$totalScore', '$totalWeighting', 0, 'completed'); </script>";