chamilo / chamilo-lms

main/dashboard/dashboard_controller.php

Indentation +34 added lines, -34 removed lines

@@ -85,40 +85,40 @@
         $this->view->render();
     }
 
-	/**
-	 * This method allow store user blocks from dashboard manager
-	 * render to dashboard.php view
-	 */
-	public function store_user_block()
+    /**
+     * This method allow store user blocks from dashboard manager
+     * render to dashboard.php view
+     */
+    public function store_user_block()
     {
-		$data = array();
-		$user_id = $this->user_id;
-		if (strtoupper($_SERVER['REQUEST_METHOD']) == "POST") {
-			$enabled_blocks = $_POST['enabled_blocks'];
-			$columns = $_POST['columns'];
-			$affected_rows = DashboardManager::store_user_blocks($user_id, $enabled_blocks, $columns);
-			if ($affected_rows) {
-				$data['success'] = true;
-			}
-		}
-
-		$data['dashboard_view'] = 'list';
-
-		// render to the view
-		$this->view->set_data($data);
-		$this->view->set_layout('layout');
-		$this->view->set_template('dashboard');
-		$this->view->render();
-	}
-
-	/**
-	 * This method is used when you close a block from dashboard block interface
-	 * render to dashboard.php view
-	 */
-	public function close_user_block($path)
+        $data = array();
+        $user_id = $this->user_id;
+        if (strtoupper($_SERVER['REQUEST_METHOD']) == "POST") {
+            $enabled_blocks = $_POST['enabled_blocks'];
+            $columns = $_POST['columns'];
+            $affected_rows = DashboardManager::store_user_blocks($user_id, $enabled_blocks, $columns);
+            if ($affected_rows) {
+                $data['success'] = true;
+            }
+        }
+
+        $data['dashboard_view'] = 'list';
+
+        // render to the view
+        $this->view->set_data($data);
+        $this->view->set_layout('layout');
+        $this->view->set_template('dashboard');
+        $this->view->render();
+    }
+
+    /**
+     * This method is used when you close a block from dashboard block interface
+     * render to dashboard.php view
+     */
+    public function close_user_block($path)
     {
-		$user_id = $this->user_id;
-		$result = DashboardManager::close_user_block($user_id, $path);
-		$this->display($result);
-	}
+        $user_id = $this->user_id;
+        $result = DashboardManager::close_user_block($user_id, $path);
+        $this->display($result);
+    }
 }

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

main/blog/blog.php

Indentation +292 added lines, -292 removed lines

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

main/exercice/exercise.class.php

Indentation +5 added lines, -5 removed lines

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

main/exercice/hotpotatoes_exercise_report.php

Indentation +9 added lines, -9 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 /* For licensing terms, see /license.txt */
 /**
- *	Exercise list: This script shows the list of exercises for administrators and students.
- *	@package chamilo.exercise
- *	@author hubert.borderiou
- *
- */
+     *	Exercise list: This script shows the list of exercises for administrators and students.
+     *	@package chamilo.exercise
+     *	@author hubert.borderiou
+     *
+     */
 
 use ChamiloSession as Session;
 
@@ -45,7 +45,7 @@ 
 }
 
 if (!$is_allowedToEdit) {
-   // api_not_allowed();
+    // api_not_allowed();
 }
 
 if (!empty($_REQUEST['path'])) {
@@ -190,9 +190,9 @@ 
         get_lang('Actions')
     );
 
-  // Column config
-  // @todo fix search firstname/lastname that doesn't work. rmove search for the moment
-	$column_model   = array(
+    // Column config
+    // @todo fix search firstname/lastname that doesn't work. rmove search for the moment
+    $column_model   = array(
         array('name'=>'firstname',      'index'=>'firstname',		'width'=>'50',   'align'=>'left', 'search' => 'false'),
         array('name'=>'lastname',		    'index'=>'lastname',		'width'=>'50',   'align'=>'left', 'formatter'=>'action_formatter', 'search' => 'false'),
         array('name'=>'login',          'hidden'=>'true',       'index'=>'username',        'width'=>'40',   'align'=>'left', 'search' => 'false'),

main/exercice/hotspot.inc.php

Indentation +6 added lines, -6 removed lines

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

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

main/exercice/TestCategory.php

Indentation +253 added lines, -253 removed lines

@@ -13,11 +13,11 @@ 
     public $name;
     public $description;
 
-	/**
-	 * Constructor of the class Category
-	 * If you give an in_id and no in_name, you get info concerning the category of id=in_id
-	 * otherwise, you've got an category objet avec your in_id, in_name, in_descr
-	 *
+    /**
+     * Constructor of the class Category
+     * If you give an in_id and no in_name, you get info concerning the category of id=in_id
+     * otherwise, you've got an category objet avec your in_id, in_name, in_descr
+     *
      * @param int    $id
      * @param string $name
      * @param string $description
@@ -61,9 +61,9 @@ 
         }
     }
 
-	/**
+    /**
      * add TestCategory in the database if name doesn't already exists
-	 */
+     */
     public function addCategoryInBDD()
     {
         $table = Database :: get_course_table(TABLE_QUIZ_QUESTION_CATEGORY);
@@ -108,12 +108,12 @@ 
 
             return false;
         }
-	}
+    }
 
-	/**
+    /**
      * Removes the category from the database
      * if there were question in this category, the link between question and category is removed
-	 */
+     */
     public function removeCategory()
     {
         $table = Database :: get_course_table(TABLE_QUIZ_QUESTION_CATEGORY);
@@ -143,11 +143,11 @@ 
 
             return true;
         }
-	}
+    }
 
-	/**
+    /**
      * Modify category name or description of category with id=in_id
-	 */
+     */
     public function modifyCategory()
     {
         $table = Database :: get_course_table(TABLE_QUIZ_QUESTION_CATEGORY);
@@ -175,40 +175,40 @@ 
 
             return true;
         }
-	}
+    }
 
-	/**
+    /**
      * Gets the number of question of category id=in_id
-	 */
+     */
     public function getCategoryQuestionsNumber()
     {
-		$table = Database::get_course_table(TABLE_QUIZ_QUESTION_REL_CATEGORY);
-		$in_id = intval($this->id);
-		$sql = "SELECT count(*) AS nb
+        $table = Database::get_course_table(TABLE_QUIZ_QUESTION_REL_CATEGORY);
+        $in_id = intval($this->id);
+        $sql = "SELECT count(*) AS nb
 		        FROM $table
 		        WHERE category_id=$in_id AND c_id=".api_get_course_int_id();
-		$res = Database::query($sql);
-		$row = Database::fetch_array($res);
+        $res = Database::query($sql);
+        $row = Database::fetch_array($res);
 
-		return $row['nb'];
-	}
+        return $row['nb'];
+    }
 
     /**
      * @param string $in_color
      */
     public function display($in_color="#E0EBF5")
     {
-		echo "<textarea style='background-color:$in_color; width:60%; height:100px;'>";
-		print_r($this);
-		echo "</textarea>";
-	}
+        echo "<textarea style='background-color:$in_color; width:60%; height:100px;'>";
+        print_r($this);
+        echo "</textarea>";
+    }
 
-	/**
+    /**
      * Return an array of all Category objects in the database
-	 * If in_field=="" Return an array of all category objects in the database
-	 * Otherwise, return an array of all in_field value
-	 * in the database (in_field = id or name or description)
-	 */
+     * If in_field=="" Return an array of all category objects in the database
+     * Otherwise, return an array of all in_field value
+     * in the database (in_field = id or name or description)
+     */
     public static function getCategoryListInfo($in_field = "", $courseId = "")
     {
         if (empty($courseId) || $courseId=="") {
@@ -239,8 +239,8 @@ 
             }
         }
 
-		return $tabres;
-	}
+        return $tabres;
+    }
 
     /**
      * Return the TestCategory id for question with question_id = $questionId
@@ -251,196 +251,196 @@ 
      *
      * @return int
      */
-	public static function getCategoryForQuestion($questionId, $courseId ="")
+    public static function getCategoryForQuestion($questionId, $courseId ="")
     {
-		$result = 0;
+        $result = 0;
         if (empty($courseId) || $courseId == "") {
             $courseId = api_get_course_int_id();
         }
-		$table = Database::get_course_table(TABLE_QUIZ_QUESTION_REL_CATEGORY);
+        $table = Database::get_course_table(TABLE_QUIZ_QUESTION_REL_CATEGORY);
         $questionId = intval($questionId);
-		$sql = "SELECT category_id
+        $sql = "SELECT category_id
 		        FROM $table
 		        WHERE question_id = $questionId AND c_id = $courseId";
-		$res = Database::query($sql);
-		if (Database::num_rows($res) > 0) {
+        $res = Database::query($sql);
+        if (Database::num_rows($res) > 0) {
             $data = Database::fetch_array($res);
-			$result = $data['category_id'];
-		}
+            $result = $data['category_id'];
+        }
 
-		return $result;
-	}
+        return $result;
+    }
 
-	/**
-	 * true if question id has a category
-	 */
-	public static function isQuestionHasCategory($questionId)
+    /**
+     * true if question id has a category
+     */
+    public static function isQuestionHasCategory($questionId)
     {
-		if (TestCategory::getCategoryForQuestion($questionId) > 0) {
-			return true;
-		}
-		return false;
-	}
+        if (TestCategory::getCategoryForQuestion($questionId) > 0) {
+            return true;
+        }
+        return false;
+    }
 
-	/**
+    /**
 	 Return the category name for question with question_id = $questionId
 	 In this version, a question has only 1 category.
 	 Return the category id, "" if none
-	 */
+     */
     public static function getCategoryNameForQuestion(
         $questionId,
         $courseId = ""
     ) {
-		if (empty($courseId) || $courseId=="") {
-			$courseId = api_get_course_int_id();
-		}
-		$catid = TestCategory::getCategoryForQuestion($questionId, $courseId);
-		$result = "";	// result
-		$table = Database::get_course_table(TABLE_QUIZ_QUESTION_CATEGORY);
-		$catid = intval($catid);
-		$sql = "SELECT title FROM $table
+        if (empty($courseId) || $courseId=="") {
+            $courseId = api_get_course_int_id();
+        }
+        $catid = TestCategory::getCategoryForQuestion($questionId, $courseId);
+        $result = "";	// result
+        $table = Database::get_course_table(TABLE_QUIZ_QUESTION_CATEGORY);
+        $catid = intval($catid);
+        $sql = "SELECT title FROM $table
 		        WHERE id = $catid  AND c_id = $courseId";
-		$res = Database::query($sql);
-		$data = Database::fetch_array($res);
-		if (Database::num_rows($res) > 0) {
-			$result = $data['title'];
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Return the list of differents categories ID for a test in the current course
-	 * input : test_id
-	 * return : array of category id (integer)
-	 * hubert.borderiou 07-04-2011
-	 */
-	public static function getListOfCategoriesIDForTest($in_testid)
+        $res = Database::query($sql);
+        $data = Database::fetch_array($res);
+        if (Database::num_rows($res) > 0) {
+            $result = $data['title'];
+        }
+
+        return $result;
+    }
+
+    /**
+     * Return the list of differents categories ID for a test in the current course
+     * input : test_id
+     * return : array of category id (integer)
+     * hubert.borderiou 07-04-2011
+     */
+    public static function getListOfCategoriesIDForTest($in_testid)
     {
-		// parcourir les questions d'un test, recup les categories uniques dans un tableau
-		$result = array();
-		$quiz = new Exercise();
-		$quiz->read($in_testid);
-		$tabQuestionList = $quiz->selectQuestionList();
-		// the array given by selectQuestionList start at indice 1 and not at indice 0 !!! ???
-		for ($i=1; $i <= count($tabQuestionList); $i++) {
-			if (!in_array(TestCategory::getCategoryForQuestion($tabQuestionList[$i]), $result)) {
-				$result[] = TestCategory::getCategoryForQuestion($tabQuestionList[$i]);
-			}
-		}
-
-		return $result;
-	}
-
-	/**
-	 * return the list of different categories NAME for a test
-	 * input : test_id
-	 * return : array of string
-	 * hubert.borderiou 07-04-2011
+        // parcourir les questions d'un test, recup les categories uniques dans un tableau
+        $result = array();
+        $quiz = new Exercise();
+        $quiz->read($in_testid);
+        $tabQuestionList = $quiz->selectQuestionList();
+        // the array given by selectQuestionList start at indice 1 and not at indice 0 !!! ???
+        for ($i=1; $i <= count($tabQuestionList); $i++) {
+            if (!in_array(TestCategory::getCategoryForQuestion($tabQuestionList[$i]), $result)) {
+                $result[] = TestCategory::getCategoryForQuestion($tabQuestionList[$i]);
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * return the list of different categories NAME for a test
+     * input : test_id
+     * return : array of string
+     * hubert.borderiou 07-04-2011
      * @author function rewrote by jmontoya
-	 */
-	public static function getListOfCategoriesNameForTest($in_testid)
+     */
+    public static function getListOfCategoriesNameForTest($in_testid)
     {
-		$tabcatName = array();
-		$tabcatID = self::getListOfCategoriesIDForTest($in_testid);
-		for ($i=0; $i < count($tabcatID); $i++) {
-			$cat = new TestCategory($tabcatID[$i]);
-			$tabcatName[$cat->id] = $cat->name;
-		}
-		return $tabcatName;
-	}
-
-	/**
-	 * return the number of differents categories for a test
-	 * input : test_id
-	 * return : integer
-	 * hubert.borderiou 07-04-2011
-	 */
-	public static function getNumberOfCategoriesForTest($in_testid)
+        $tabcatName = array();
+        $tabcatID = self::getListOfCategoriesIDForTest($in_testid);
+        for ($i=0; $i < count($tabcatID); $i++) {
+            $cat = new TestCategory($tabcatID[$i]);
+            $tabcatName[$cat->id] = $cat->name;
+        }
+        return $tabcatName;
+    }
+
+    /**
+     * return the number of differents categories for a test
+     * input : test_id
+     * return : integer
+     * hubert.borderiou 07-04-2011
+     */
+    public static function getNumberOfCategoriesForTest($in_testid)
     {
-		return count(TestCategory::getListOfCategoriesIDForTest($in_testid));
-	}
+        return count(TestCategory::getListOfCategoriesIDForTest($in_testid));
+    }
 
-	/**
-	 * return the number of question of a category id in a test
-	 * @param int $exerciseId
+    /**
+     * return the number of question of a category id in a test
+     * @param int $exerciseId
      * @param int $categoryId
      *
-	 * @return integer
+     * @return integer
      *
-	 * @author hubert.borderiou 07-04-2011
-	 */
-	public static function getNumberOfQuestionsInCategoryForTest($exerciseId, $categoryId)
+     * @author hubert.borderiou 07-04-2011
+     */
+    public static function getNumberOfQuestionsInCategoryForTest($exerciseId, $categoryId)
     {
-		$nbCatResult = 0;
-		$quiz = new Exercise();
-		$quiz->read($exerciseId);
-		$tabQuestionList = $quiz->selectQuestionList();
-		// the array given by selectQuestionList start at indice 1 and not at indice 0 !!! ? ? ?
-		for ($i=1; $i <= count($tabQuestionList); $i++) {
-			if (TestCategory::getCategoryForQuestion($tabQuestionList[$i]) == $categoryId) {
-				$nbCatResult++;
-			}
-		}
-
-		return $nbCatResult;
-	}
-
-	/**
-	 * return the number of question for a test using random by category
-	 * input  : test_id, number of random question (min 1)
-	 * hubert.borderiou 07-04-2011
-	 * question without categories are not counted
-	 */
-	public static function getNumberOfQuestionRandomByCategory($exerciseId, $in_nbrandom)
+        $nbCatResult = 0;
+        $quiz = new Exercise();
+        $quiz->read($exerciseId);
+        $tabQuestionList = $quiz->selectQuestionList();
+        // the array given by selectQuestionList start at indice 1 and not at indice 0 !!! ? ? ?
+        for ($i=1; $i <= count($tabQuestionList); $i++) {
+            if (TestCategory::getCategoryForQuestion($tabQuestionList[$i]) == $categoryId) {
+                $nbCatResult++;
+            }
+        }
+
+        return $nbCatResult;
+    }
+
+    /**
+     * return the number of question for a test using random by category
+     * input  : test_id, number of random question (min 1)
+     * hubert.borderiou 07-04-2011
+     * question without categories are not counted
+     */
+    public static function getNumberOfQuestionRandomByCategory($exerciseId, $in_nbrandom)
     {
-		$nbquestionresult = 0;
-		$tabcatid = TestCategory::getListOfCategoriesIDForTest($exerciseId);
-		for ($i=0; $i < count($tabcatid); $i++) {
-			if ($tabcatid[$i] > 0) {	// 0 = no category for this questio
-				$nbQuestionInThisCat = TestCategory::getNumberOfQuestionsInCategoryForTest($exerciseId, $tabcatid[$i]);
-				if ($nbQuestionInThisCat > $in_nbrandom) {
-					$nbquestionresult += $in_nbrandom;
-				}
-				else {
-					$nbquestionresult += $nbQuestionInThisCat;
-				}
-			}
-		}
-		return $nbquestionresult;
-	}
-
-	/**
-	 * Return an array (id=>name)
-	 * tabresult[0] = get_lang('NoCategory');
+        $nbquestionresult = 0;
+        $tabcatid = TestCategory::getListOfCategoriesIDForTest($exerciseId);
+        for ($i=0; $i < count($tabcatid); $i++) {
+            if ($tabcatid[$i] > 0) {	// 0 = no category for this questio
+                $nbQuestionInThisCat = TestCategory::getNumberOfQuestionsInCategoryForTest($exerciseId, $tabcatid[$i]);
+                if ($nbQuestionInThisCat > $in_nbrandom) {
+                    $nbquestionresult += $in_nbrandom;
+                }
+                else {
+                    $nbquestionresult += $nbQuestionInThisCat;
+                }
+            }
+        }
+        return $nbquestionresult;
+    }
+
+    /**
+     * Return an array (id=>name)
+     * tabresult[0] = get_lang('NoCategory');
      *
      * @param int $courseId
      *
      * @return array
-	 *
-	 */
+     *
+     */
     public static function getCategoriesIdAndName($courseId = "")
     {
-		if (empty($courseId)) {
-			$courseId = api_get_course_int_id();
-		}
-	 	$tabcatobject = TestCategory::getCategoryListInfo("", $courseId);
-	 	$tabresult = array("0"=>get_lang('NoCategorySelected'));
-	 	for ($i=0; $i < count($tabcatobject); $i++) {
-	 		$tabresult[$tabcatobject[$i]->id] = $tabcatobject[$i]->name;
-	 	}
-	 	return $tabresult;
-	}
+        if (empty($courseId)) {
+            $courseId = api_get_course_int_id();
+        }
+            $tabcatobject = TestCategory::getCategoryListInfo("", $courseId);
+            $tabresult = array("0"=>get_lang('NoCategorySelected'));
+            for ($i=0; $i < count($tabcatobject); $i++) {
+                $tabresult[$tabcatobject[$i]->id] = $tabcatobject[$i]->name;
+            }
+            return $tabresult;
+    }
 
     /**
-    * return an array of question_id for each category
-    * tabres[0] = array of question id with category id = 0 (i.e. no category)
-    * tabres[24] = array of question id with category id = 24
-    * In this version, a question has 0 or 1 category
-    *
-    * @param int $exerciseId
-    * @return array
-    */
+     * return an array of question_id for each category
+     * tabres[0] = array of question id with category id = 0 (i.e. no category)
+     * tabres[24] = array of question id with category id = 24
+     * In this version, a question has 0 or 1 category
+     *
+     * @param int $exerciseId
+     * @return array
+     */
     public static function getQuestionsByCat($exerciseId)
     {
         $em = Database::getManager();
@@ -469,29 +469,29 @@ 
             }
             $list[$data['categoryId']][] = $data['questionId'];
         }
-		return $list;
-	}
+        return $list;
+    }
 
-	/**
-	 * return a tab of $in_number random elements of $in_tab
-	 */
+    /**
+     * return a tab of $in_number random elements of $in_tab
+     */
     public static function getNElementsFromArray($in_tab, $in_number)
     {
-		$tabres = $in_tab;
-		shuffle($tabres);
-		if ($in_number < count($tabres)) {
-			$tabres = array_slice($tabres, 0, $in_number);
-		}
-		return $tabres;
-	}
-
-	/**
-	 * display the category
-	 */
-	public static function displayCategoryAndTitle($questionId, $in_display_category_name = 1)
+        $tabres = $in_tab;
+        shuffle($tabres);
+        if ($in_number < count($tabres)) {
+            $tabres = array_slice($tabres, 0, $in_number);
+        }
+        return $tabres;
+    }
+
+    /**
+     * display the category
+     */
+    public static function displayCategoryAndTitle($questionId, $in_display_category_name = 1)
     {
         echo self::returnCategoryAndTitle($questionId, $in_display_category_name);
-	}
+    }
 
     /**
      * @param int $questionId
@@ -507,71 +507,71 @@ 
             $in_display_category_name = $objExercise->display_category_name;
         }
         $content = null;
-		if (TestCategory::getCategoryNameForQuestion($questionId) != "" && ($in_display_category_name == 1 || !$is_student)) {
+        if (TestCategory::getCategoryNameForQuestion($questionId) != "" && ($in_display_category_name == 1 || !$is_student)) {
             $content .= '<div class="page-header">';
             $content .= '<h4>'.get_lang('Category').": ".TestCategory::getCategoryNameForQuestion($questionId).'</h4>';
             $content .= "</div>";
-		}
+        }
         return $content;
-	}
+    }
 
     /**
-    * Display signs [+] and/or (>0) after question title if question has options
-    * scoreAlwaysPositive and/or uncheckedMayScore
-    */
+     * Display signs [+] and/or (>0) after question title if question has options
+     * scoreAlwaysPositive and/or uncheckedMayScore
+     */
     public function displayQuestionOption($in_objQuestion)
     {
-		if ($in_objQuestion->type == MULTIPLE_ANSWER && $in_objQuestion->scoreAlwaysPositive) {
-			echo "<span style='font-size:75%'> (>0)</span>";
-		}
-		if ($in_objQuestion->type == MULTIPLE_ANSWER && $in_objQuestion->uncheckedMayScore) {
-			echo "<span style='font-size:75%'> [+]</span>";
-		}
-	}
-
-	/**
-	 * sortTabByBracketLabel ($tabCategoryQuestions)
-	 * key of $tabCategoryQuestions are the category id (0 for not in a category)
-	 * value is the array of question id of this category
-	 * Sort question by Category
-	*/
+        if ($in_objQuestion->type == MULTIPLE_ANSWER && $in_objQuestion->scoreAlwaysPositive) {
+            echo "<span style='font-size:75%'> (>0)</span>";
+        }
+        if ($in_objQuestion->type == MULTIPLE_ANSWER && $in_objQuestion->uncheckedMayScore) {
+            echo "<span style='font-size:75%'> [+]</span>";
+        }
+    }
+
+    /**
+     * sortTabByBracketLabel ($tabCategoryQuestions)
+     * key of $tabCategoryQuestions are the category id (0 for not in a category)
+     * value is the array of question id of this category
+     * Sort question by Category
+     */
     public static function sortTabByBracketLabel($in_tab)
     {
-		$tabResult = array();
-		$tabCatName = array();	// tab of category name
-		while (list($cat_id, $tabquestion) = each($in_tab)) {
-			$catTitle = new TestCategory($cat_id);
-			$tabCatName[$cat_id] = $catTitle->name;
-		}
-		reset($in_tab);
-		// sort table by value, keeping keys as they are
-		asort($tabCatName);
-		// keys of $tabCatName are keys order for $in_tab
-		while (list($key, $val) = each($tabCatName)) {
-			$tabResult[$key] = $in_tab[$key];
-		}
-		return $tabResult;
-	}
+        $tabResult = array();
+        $tabCatName = array();	// tab of category name
+        while (list($cat_id, $tabquestion) = each($in_tab)) {
+            $catTitle = new TestCategory($cat_id);
+            $tabCatName[$cat_id] = $catTitle->name;
+        }
+        reset($in_tab);
+        // sort table by value, keeping keys as they are
+        asort($tabCatName);
+        // keys of $tabCatName are keys order for $in_tab
+        while (list($key, $val) = each($tabCatName)) {
+            $tabResult[$key] = $in_tab[$key];
+        }
+        return $tabResult;
+    }
 
     /**
      * return the number max of question in a category
      * count the number of questions in all categories, and return the max
      * @param int $exerciseId
      * @author - hubert borderiou
-    */
+     */
     public static function getNumberMaxQuestionByCat($exerciseId)
     {
         $res_num_max = 0;
         // foreach question
-		$tabcatid = TestCategory::getListOfCategoriesIDForTest($exerciseId);
-		for ($i=0; $i < count($tabcatid); $i++) {
-			if ($tabcatid[$i] > 0) {	// 0 = no category for this question
-				$nbQuestionInThisCat = TestCategory::getNumberOfQuestionsInCategoryForTest($exerciseId, $tabcatid[$i]);
+        $tabcatid = TestCategory::getListOfCategoriesIDForTest($exerciseId);
+        for ($i=0; $i < count($tabcatid); $i++) {
+            if ($tabcatid[$i] > 0) {	// 0 = no category for this question
+                $nbQuestionInThisCat = TestCategory::getNumberOfQuestionsInCategoryForTest($exerciseId, $tabcatid[$i]);
                 if ($nbQuestionInThisCat > $res_num_max) {
                     $res_num_max = $nbQuestionInThisCat;
                 }
-			}
-		}
+            }
+        }
         return $res_num_max;
     }
 
@@ -677,8 +677,8 @@ 
      * @param int $categoryId
      * @param int $questionId
      * @param int $courseId
-	 *
-	 * @return int
+     *
+     * @return int
      */
     public static function add_category_for_question_id($categoryId, $questionId, $courseId)
     {
@@ -686,18 +686,18 @@ 
         // if question doesn't have a category
         // @todo change for 1.10 when a question can have several categories
         if (TestCategory::getCategoryForQuestion($questionId, $courseId) == 0 &&
-			$questionId > 0 &&
-			$courseId > 0
+            $questionId > 0 &&
+            $courseId > 0
         ) {
             $sql = "INSERT INTO $table (c_id, question_id, category_id)
                     VALUES (".intval($courseId).", ".intval($questionId).", ".intval($categoryId).")";
             Database::query($sql);
-			$id = Database::insert_id();
+            $id = Database::insert_id();
 
-			return $id;
+            return $id;
         }
 
-		return false;
+        return false;
     }
 
     /**

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