diff --git a/main/announcements/announcement_email.class.php b/main/announcements/announcement_email.class.php
index db2fe9687e..a03d3a8ad1 100755
--- a/main/announcements/announcement_email.class.php
+++ b/main/announcements/announcement_email.class.php
@@ -1,5 +1,6 @@
 <?php
 /* For licensing terms, see /license.txt */
+
 /**
  * Announcement Email
  *
@@ -245,9 +246,9 @@ class AnnouncementEmail
         if (!empty($attachment)) {
             $result .= '<br />';
             $result .= Display::url(
-                $attachment['filename'],
-                api_get_path(WEB_CODE_PATH).'announcements/download.php?file='.basename($attachment['path']).'&'.$course_param
-            ).'<br />';
+                    $attachment['filename'],
+                    api_get_path(WEB_CODE_PATH).'announcements/download.php?file='.basename($attachment['path']).'&'.$course_param
+                ).'<br />';
         }
 
         $result .= '<hr />';
diff --git a/main/announcements/announcements.inc.php b/main/announcements/announcements.inc.php
index b8fb4ad689..9abc9a1fc2 100755
--- a/main/announcements/announcements.inc.php
+++ b/main/announcements/announcements.inc.php
@@ -224,12 +224,12 @@ class AnnouncementManager
                 global $stok;
 
                 $modify_icons .= "<a href=\"" . api_get_self() . "?" . api_get_cidreq() . "&origin=" . (!empty($_GET['origin']) ? Security::remove_XSS($_GET['origin']) : '') . "&action=showhide&id=" . $announcement_id . "&sec_token=" . $stok . "\">" .
-                        Display::return_icon($image_visibility . '.png', $alt_visibility, '', ICON_SIZE_SMALL) . "</a>";
+                    Display::return_icon($image_visibility . '.png', $alt_visibility, '', ICON_SIZE_SMALL) . "</a>";
 
                 if (api_is_allowed_to_edit(false, true)) {
                     $modify_icons .= "<a href=\"" . api_get_self() . "?" . api_get_cidreq() . "&action=delete&id=" . $announcement_id . "&sec_token=" . $stok . "\" onclick=\"javascript:if(!confirm('" . addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES, $charset)) . "')) return false;\">" .
-                            Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL) .
-                            "</a>";
+                        Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL) .
+                        "</a>";
                 }
                 echo "<tr><th style='text-align:right'>$modify_icons</th></tr>";
             }
@@ -522,8 +522,8 @@ class AnnouncementManager
     }
 
     /**
-    * @param int $announcementId
-    */
+     * @param int $announcementId
+     */
     public static function addAnnouncementToAllUsersInSessions($announcementId)
     {
         $courseCode = api_get_course_id();
@@ -720,7 +720,7 @@ class AnnouncementManager
                         $user_disabled = ($this_group['userNb'] > 0) ? "" : "disabled=disabled" ;
                         echo "<option $user_disabled value=\"GROUP:" . $this_group['id'] . "\">",
                         "G: ", $this_group['name'], " - " . $this_group['userNb'] . " " . $user_label .
-                        "</option>";
+                            "</option>";
                     }
                 }
             }
@@ -786,7 +786,7 @@ class AnnouncementManager
                         if (!is_array($to_already_selected) || !in_array("GROUP:" . $this_group['id'], $to_already_selected)) { // $to_already_selected is the array containing the groups (and users) that are already selected
                             echo "<option value=\"GROUP:" . $this_group['id'] . "\">",
                             "G: ", $this_group['name'], " &ndash; " . $this_group['userNb'] . " " . get_lang('Users') .
-                            "</option>";
+                                "</option>";
                         }
                     }
                 }
@@ -1138,7 +1138,7 @@ class AnnouncementManager
                 $safe_new_file_name = Database::escape_string($new_file_name);
                 // Storing the attachments if any
                 $sql = 'INSERT INTO ' . $tbl_announcement_attachment . ' (c_id, filename, comment, path, announcement_id, size) ' .
-                        "VALUES ($course_id, '$safe_file_name', '$file_comment', '$safe_new_file_name' , '$announcement_id', '" . intval($file['size']) . "' )";
+                    "VALUES ($course_id, '$safe_file_name', '$file_comment', '$safe_new_file_name' , '$announcement_id', '" . intval($file['size']) . "' )";
                 $result = Database::query($sql);
                 $return = 1;
             }
diff --git a/main/announcements/announcements.php b/main/announcements/announcements.php
index de92825ee9..883e5cdf98 100755
--- a/main/announcements/announcements.php
+++ b/main/announcements/announcements.php
@@ -12,12 +12,9 @@
  * @todo make AWACS out of the configuration settings
  * @todo this file is 1300+ lines without any functions -> needs to be split into
  * multiple functions
-*/
-/*
-		INIT SECTION
-*/
-// name of the language file that needs to be included
+ */
 
+// name of the language file that needs to be included
 use \ChamiloSession as Session;
 
 $language_file = array('announcements', 'group', 'survey', 'document');
@@ -33,7 +30,7 @@ $nameTools = get_lang('ToolAnnouncement');
 
 //session
 if(isset($_GET['id_session'])) {
-	$_SESSION['id_session'] = intval($_GET['id_session']);
+    $_SESSION['id_session'] = intval($_GET['id_session']);
 }
 
 /* ACCESS RIGHTS */
@@ -79,12 +76,12 @@ $safe_newContent = isset($_POST['newContent']) ? $_POST['newContent'] : null;
 $content_to_modify = $title_to_modify 	= '';
 
 if (!empty($_POST['To'])) {
-	if (api_get_session_id()!=0 &&
+    if (api_get_session_id()!=0 &&
         api_is_allowed_to_session_edit(false, true) == false
     ) {
-		api_not_allowed(true);
-	}
-	$display_form = true;
+        api_not_allowed(true);
+    }
+    $display_form = true;
 
     $form_elements = array(
         'emailTitle' => $safe_emailTitle,
@@ -95,9 +92,9 @@ if (!empty($_POST['To'])) {
     $_SESSION['formelements'] = $form_elements;
 
     $form_elements            	= $_SESSION['formelements'];
-	$title_to_modify            = $form_elements["emailTitle"];
-	$content_to_modify          = $form_elements["newContent"];
-	$announcement_to_modify     = $form_elements["id"];
+    $title_to_modify            = $form_elements["emailTitle"];
+    $content_to_modify          = $form_elements["newContent"];
+    $announcement_to_modify     = $form_elements["id"];
 }
 
 /*
@@ -106,14 +103,14 @@ if (!empty($_POST['To'])) {
 
 $setting_select_groupusers = true;
 if (empty($_POST['To']) and !isset($_SESSION['select_groupusers'])) {
-	$_SESSION['select_groupusers'] = "hide";
+    $_SESSION['select_groupusers'] = "hide";
 }
 $select_groupusers_status = isset($_SESSION['select_groupusers']) ? $_SESSION['select_groupusers']:null;
 if (!empty($_POST['To']) and ($select_groupusers_status=="hide")) {
-	$_SESSION['select_groupusers'] = "show";
+    $_SESSION['select_groupusers'] = "show";
 }
 if (!empty($_POST['To']) and ($select_groupusers_status=="show")) {
-	$_SESSION['select_groupusers'] = "hide";
+    $_SESSION['select_groupusers'] = "hide";
 }
 
 $origin = isset($_GET['origin']) ? Security::remove_XSS($_GET['origin']) : null;
@@ -124,15 +121,15 @@ $origin = isset($_GET['origin']) ? Security::remove_XSS($_GET['origin']) : null;
 if (((!empty($_GET['action']) && $_GET['action'] == 'add') && $_GET['origin'] == "") ||
     (!empty($_GET['action']) && $_GET['action'] == 'edit') || !empty($_POST['To'])
 ) {
-	if (api_get_session_id()!=0 && api_is_allowed_to_session_edit(false,true) == false) {
-		api_not_allowed(true);
-	}
-	$display_form = true;
+    if (api_get_session_id()!=0 && api_is_allowed_to_session_edit(false,true) == false) {
+        api_not_allowed(true);
+    }
+    $display_form = true;
 }
 
 // clear all resources
 if ((empty($originalresource) || ($originalresource!=='no')) and (!empty($action) && $action=='add')) {
-	$_SESSION['formelements']=null;
+    $_SESSION['formelements']=null;
 }
 
 $htmlHeadXtra[] = AnnouncementManager::to_javascript();
@@ -140,14 +137,14 @@ $htmlHeadXtra[] = AnnouncementManager::to_javascript();
 /*	Filter user/group */
 
 if(!empty($_GET['toolgroup'])){
-	if($_GET['toolgroup'] == strval(intval($_GET['toolgroup']))){
-	    //check is integer
-		$toolgroup = intval($_GET['toolgroup']);
-		$_SESSION['select_groupusers'] = 'hide';
-	} else {
-		$toolgroup = 0;
-	}
-	Session::write("toolgroup", $toolgroup);
+    if($_GET['toolgroup'] == strval(intval($_GET['toolgroup']))){
+        //check is integer
+        $toolgroup = intval($_GET['toolgroup']);
+        $_SESSION['select_groupusers'] = 'hide';
+    } else {
+        $toolgroup = 0;
+    }
+    Session::write("toolgroup", $toolgroup);
 }
 
 /*	Sessions */
@@ -161,32 +158,32 @@ if (!empty($_SESSION['formelements']) and
     !empty($_GET['originalresource']) and
     $_GET['originalresource'] == 'no'
 ) {
-	$form_elements			= $_SESSION['formelements'];
-	$title_to_modify		= $form_elements['emailTitle'];
-	$content_to_modify		= $form_elements['newContent'];
-	$announcement_to_modify	= $form_elements['id'];
-	$to						= $form_elements['to'];
-	$email_ann				= $form_elements['emailoption'];
+    $form_elements			= $_SESSION['formelements'];
+    $title_to_modify		= $form_elements['emailTitle'];
+    $content_to_modify		= $form_elements['newContent'];
+    $announcement_to_modify	= $form_elements['id'];
+    $to						= $form_elements['to'];
+    $email_ann				= $form_elements['emailoption'];
 }
 
 if (!empty($_GET['remind_inactive'])) {
-	$to[] = 'USER:'.intval($_GET['remind_inactive']);
+    $to[] = 'USER:'.intval($_GET['remind_inactive']);
 }
 
 $group_id = api_get_group_id();
 
 if (!empty($group_id)) {
-	$group_properties  = GroupManager :: get_group_properties($group_id);
-	$interbreadcrumb[] = array("url" => "../group/group.php", "name" => get_lang('Groups'));
-	$interbreadcrumb[] = array("url"=>"../group/group_space.php?gidReq=".$group_id, "name"=> get_lang('GroupSpace').' '.$group_properties['name']);
+    $group_properties  = GroupManager :: get_group_properties($group_id);
+    $interbreadcrumb[] = array("url" => "../group/group.php", "name" => get_lang('Groups'));
+    $interbreadcrumb[] = array("url"=>"../group/group_space.php?gidReq=".$group_id, "name"=> get_lang('GroupSpace').' '.$group_properties['name']);
 }
 
 $announcement_id = isset($_GET['id']) ? intval($_GET['id']) : null;
 $message = null;
 
 if (empty($_GET['origin']) or $_GET['origin'] !== 'learnpath') {
-	//we are not in the learning path
-	Display::display_header($nameTools,get_lang('Announcements'));
+    //we are not in the learning path
+    Display::display_header($nameTools,get_lang('Announcements'));
 }
 
 if (api_is_allowed_to_edit(false,true) OR
@@ -195,45 +192,45 @@ if (api_is_allowed_to_edit(false,true) OR
     /*
         Change visibility of announcement
     */
-	// $_GET['isStudentView']<>"false" is added to prevent that the visibility
-	// is changed after you do the following:
-	// change visibility -> studentview -> course manager view
-	if (!isset($_GET['isStudentView']) || $_GET['isStudentView']!='false') {
-		if (isset($_GET['id']) AND $_GET['id'] AND isset($_GET['action']) AND $_GET['action']=="showhide") {
-			if (api_get_session_id()!=0 && api_is_allowed_to_session_edit(false,true)==false) {
-				api_not_allowed();
-			}
-			if (!api_is_course_coach() || api_is_element_in_the_session(TOOL_ANNOUNCEMENT, $_GET['id'])) {
-				if ($ctok == $_GET['sec_token']) {
-					AnnouncementManager::change_visibility_announcement($_course, $_GET['id']);
-					$message = get_lang('VisibilityChanged');
-				}
-			}
-		}
-	}
-
-	/* Delete announcement */
-	if (!empty($_GET['action']) && $_GET['action']=='delete' && isset($_GET['id'])) {
-		$id = intval($_GET['id']);
-		if (api_get_session_id()!=0 && api_is_allowed_to_session_edit(false, true) == false) {
-			api_not_allowed();
-		}
-
-		if (!api_is_course_coach() || api_is_element_in_the_session(TOOL_ANNOUNCEMENT, $id)) {
-			// tooledit : visibility = 2 : only visible for platform administrator
-			if ($ctok == $_GET['sec_token']) {
-				AnnouncementManager::delete_announcement($_course, $id);
-				//delete_added_resource("Ad_Valvas", $delete);
-
-				$id = null;
-				$emailTitle = null;
-				$newContent = null;
-				$message = get_lang('AnnouncementDeleted');
-			}
-		}
-	}
-
-      //delete attachment file
+    // $_GET['isStudentView']<>"false" is added to prevent that the visibility
+    // is changed after you do the following:
+    // change visibility -> studentview -> course manager view
+    if (!isset($_GET['isStudentView']) || $_GET['isStudentView']!='false') {
+        if (isset($_GET['id']) AND $_GET['id'] AND isset($_GET['action']) AND $_GET['action']=="showhide") {
+            if (api_get_session_id()!=0 && api_is_allowed_to_session_edit(false,true)==false) {
+                api_not_allowed();
+            }
+            if (!api_is_course_coach() || api_is_element_in_the_session(TOOL_ANNOUNCEMENT, $_GET['id'])) {
+                if ($ctok == $_GET['sec_token']) {
+                    AnnouncementManager::change_visibility_announcement($_course, $_GET['id']);
+                    $message = get_lang('VisibilityChanged');
+                }
+            }
+        }
+    }
+
+    /* Delete announcement */
+    if (!empty($_GET['action']) && $_GET['action']=='delete' && isset($_GET['id'])) {
+        $id = intval($_GET['id']);
+        if (api_get_session_id()!=0 && api_is_allowed_to_session_edit(false, true) == false) {
+            api_not_allowed();
+        }
+
+        if (!api_is_course_coach() || api_is_element_in_the_session(TOOL_ANNOUNCEMENT, $id)) {
+            // tooledit : visibility = 2 : only visible for platform administrator
+            if ($ctok == $_GET['sec_token']) {
+                AnnouncementManager::delete_announcement($_course, $id);
+                //delete_added_resource("Ad_Valvas", $delete);
+
+                $id = null;
+                $emailTitle = null;
+                $newContent = null;
+                $message = get_lang('AnnouncementDeleted');
+            }
+        }
+    }
+
+    //delete attachment file
     if (isset($_GET['action']) && $_GET['action'] == 'delete_attachment') {
         $id = $_GET['id_attach'];
         if ($ctok == $_GET['sec_token']) {
@@ -243,78 +240,78 @@ if (api_is_allowed_to_edit(false,true) OR
         }
     }
 
-	/* Delete all announcements */
-	if (!empty($_GET['action']) and $_GET['action']=='delete_all') {
-		if (api_is_allowed_to_edit()) {
-			AnnouncementManager::delete_all_announcements($_course);
-			$id = null;
-			$emailTitle = null;
-			$newContent = null;
-			$message = get_lang('AnnouncementDeletedAll');
-		}
-	}
-
-	/* Modify announcement */
-	if (!empty($_GET['action']) and $_GET['action']=='modify' AND isset($_GET['id'])) {
-		if (api_get_session_id()!=0 && api_is_allowed_to_session_edit(false,true)==false) {
-			api_not_allowed();
-		}
-
-		$display_form = true;
-
-		// RETRIEVE THE CONTENT OF THE ANNOUNCEMENT TO MODIFY
-		$id = intval($_GET['id']);
-
-		if (!api_is_course_coach() || api_is_element_in_the_session(TOOL_ANNOUNCEMENT, $id)) {
-			$sql="SELECT * FROM  $tbl_announcement WHERE c_id = $course_id AND id = '$id'";
-			$rs 	= Database::query($sql);
-			$myrow  = Database::fetch_array($rs);
-			$last_id = $id;
+    /* Delete all announcements */
+    if (!empty($_GET['action']) and $_GET['action']=='delete_all') {
+        if (api_is_allowed_to_edit()) {
+            AnnouncementManager::delete_all_announcements($_course);
+            $id = null;
+            $emailTitle = null;
+            $newContent = null;
+            $message = get_lang('AnnouncementDeletedAll');
+        }
+    }
+
+    /* Modify announcement */
+    if (!empty($_GET['action']) and $_GET['action']=='modify' AND isset($_GET['id'])) {
+        if (api_get_session_id()!=0 && api_is_allowed_to_session_edit(false,true)==false) {
+            api_not_allowed();
+        }
+
+        $display_form = true;
+
+        // RETRIEVE THE CONTENT OF THE ANNOUNCEMENT TO MODIFY
+        $id = intval($_GET['id']);
+
+        if (!api_is_course_coach() || api_is_element_in_the_session(TOOL_ANNOUNCEMENT, $id)) {
+            $sql="SELECT * FROM  $tbl_announcement WHERE c_id = $course_id AND id = '$id'";
+            $rs 	= Database::query($sql);
+            $myrow  = Database::fetch_array($rs);
+            $last_id = $id;
             $userUpload = isset($_FILES['user_upload']) ? $_FILES['user_upload'] : null;
-			$edit_attachment = AnnouncementManager::edit_announcement_attachment_file(
+            $edit_attachment = AnnouncementManager::edit_announcement_attachment_file(
                 $last_id,
                 $userUpload,
                 $file_comment
             );
 
-			if ($myrow) {
-				$announcement_to_modify 	= $myrow['id'];
-				$content_to_modify 			= $myrow['content'];
-				$title_to_modify 			= $myrow['title'];
-
-				if ($originalresource!=="no")  {
-					$to = AnnouncementManager::load_edit_users("announcement", $announcement_to_modify);
-				}
-				$display_announcement_list = false;
-			}
-
-			if ($to=="everyone" OR !empty($group_id)) {
-				$_SESSION['select_groupusers']="hide";
-			} else {
-				$_SESSION['select_groupusers']="show";
-			}
-		}
-	}
-
-	/* Move announcement up/down */
-	if (isset($_GET['sec_token']) && $ctok == $_GET['sec_token']) {
-		if (!empty($_GET['down'])) {
-			$thisAnnouncementId = intval($_GET['down']);
-			$sortDirection = "DESC";
-		}
-
-		if (!empty($_GET['up'])) {
-			$thisAnnouncementId = intval($_GET['up']);
-			$sortDirection = "ASC";
-		}
-	}
-
-	if (!empty($sortDirection)) {
-		if (!in_array(trim(strtoupper($sortDirection)), array('ASC', 'DESC'))) {
-			$sortDirection='ASC';
-		}
-
-		$sql = "SELECT announcement.id, announcement.display_order
+            if ($myrow) {
+                $announcement_to_modify 	= $myrow['id'];
+                $content_to_modify 			= $myrow['content'];
+                $title_to_modify 			= $myrow['title'];
+
+                if ($originalresource!=="no")  {
+                    $to = AnnouncementManager::load_edit_users("announcement", $announcement_to_modify);
+                }
+                $display_announcement_list = false;
+            }
+
+            if ($to=="everyone" OR !empty($group_id)) {
+                $_SESSION['select_groupusers']="hide";
+            } else {
+                $_SESSION['select_groupusers']="show";
+            }
+        }
+    }
+
+    /* Move announcement up/down */
+    if (isset($_GET['sec_token']) && $ctok == $_GET['sec_token']) {
+        if (!empty($_GET['down'])) {
+            $thisAnnouncementId = intval($_GET['down']);
+            $sortDirection = "DESC";
+        }
+
+        if (!empty($_GET['up'])) {
+            $thisAnnouncementId = intval($_GET['up']);
+            $sortDirection = "ASC";
+        }
+    }
+
+    if (!empty($sortDirection)) {
+        if (!in_array(trim(strtoupper($sortDirection)), array('ASC', 'DESC'))) {
+            $sortDirection='ASC';
+        }
+
+        $sql = "SELECT announcement.id, announcement.display_order
                 FROM $tbl_announcement announcement,
 				$tbl_item_property itemproperty
 				WHERE
@@ -324,51 +321,51 @@ if (api_is_allowed_to_edit(false,true) OR
                     itemproperty.tool='".TOOL_ANNOUNCEMENT."'  AND
                     itemproperty.visibility<>2
                 ORDER BY display_order $sortDirection";
-		$result = Database::query($sql);
-
-		while (list ($announcementId, $announcementOrder) = Database::fetch_row($result)) {
-			// STEP 2 : FOUND THE NEXT ANNOUNCEMENT ID AND ORDER.
-			//          COMMIT ORDER SWAP ON THE DB
-
-			if ($thisAnnouncementOrderFound) {
-				$nextAnnouncementId = $announcementId;
-				$nextAnnouncementOrder = $announcementOrder;
-				Database::query("UPDATE $tbl_announcement SET display_order = '$nextAnnouncementOrder'  WHERE c_id = $course_id AND id =  '$thisAnnouncementId'");
-				Database::query("UPDATE $tbl_announcement  SET display_order = '$thisAnnouncementOrder' WHERE c_id = $course_id AND id =  '$nextAnnouncementId.'");
-				break;
-			}
-			// STEP 1 : FIND THE ORDER OF THE ANNOUNCEMENT
-			if ($announcementId == $thisAnnouncementId) {
-				$thisAnnouncementOrder = $announcementOrder;
-				$thisAnnouncementOrderFound = true;
-			}
-		}
-		// show message
-		$message = get_lang('AnnouncementMoved');
-	}
-
-	/* Submit announcement */
-
-	$emailTitle = (!empty($_POST['emailTitle'])?$safe_emailTitle:'');
-	$newContent = (!empty($_POST['newContent'])?$safe_newContent:'');
-	$submitAnnouncement = isset($_POST['submitAnnouncement'])?$_POST['submitAnnouncement']:0;
-
-	$id = 0;
-	if (!empty($_POST['id'])) {
-		$id=intval($_POST['id']);
-	}
-
-	if ($submitAnnouncement && empty($emailTitle)) {
-		$error_message = get_lang('TitleIsRequired');
-		$content_to_modify = $newContent;
-	} else if ($submitAnnouncement) {
+        $result = Database::query($sql);
+
+        while (list ($announcementId, $announcementOrder) = Database::fetch_row($result)) {
+            // STEP 2 : FOUND THE NEXT ANNOUNCEMENT ID AND ORDER.
+            //          COMMIT ORDER SWAP ON THE DB
+
+            if ($thisAnnouncementOrderFound) {
+                $nextAnnouncementId = $announcementId;
+                $nextAnnouncementOrder = $announcementOrder;
+                Database::query("UPDATE $tbl_announcement SET display_order = '$nextAnnouncementOrder'  WHERE c_id = $course_id AND id =  '$thisAnnouncementId'");
+                Database::query("UPDATE $tbl_announcement  SET display_order = '$thisAnnouncementOrder' WHERE c_id = $course_id AND id =  '$nextAnnouncementId.'");
+                break;
+            }
+            // STEP 1 : FIND THE ORDER OF THE ANNOUNCEMENT
+            if ($announcementId == $thisAnnouncementId) {
+                $thisAnnouncementOrder = $announcementOrder;
+                $thisAnnouncementOrderFound = true;
+            }
+        }
+        // show message
+        $message = get_lang('AnnouncementMoved');
+    }
+
+    /* Submit announcement */
+
+    $emailTitle = (!empty($_POST['emailTitle'])?$safe_emailTitle:'');
+    $newContent = (!empty($_POST['newContent'])?$safe_newContent:'');
+    $submitAnnouncement = isset($_POST['submitAnnouncement'])?$_POST['submitAnnouncement']:0;
+
+    $id = 0;
+    if (!empty($_POST['id'])) {
+        $id=intval($_POST['id']);
+    }
+
+    if ($submitAnnouncement && empty($emailTitle)) {
+        $error_message = get_lang('TitleIsRequired');
+        $content_to_modify = $newContent;
+    } else if ($submitAnnouncement) {
         $sendToUsersInSession = isset($_POST['send_to_users_in_session']) ? true : false;
 
-		if (isset($id) && $id) {
-			// there is an Id => the announcement already exists => update mode
-			if ($ctok == $_POST['sec_token']) {
-				$file_comment = $_POST['file_comment'];
-				$file = $_FILES['user_upload'];
+        if (isset($id) && $id) {
+            // there is an Id => the announcement already exists => update mode
+            if ($ctok == $_POST['sec_token']) {
+                $file_comment = $_POST['file_comment'];
+                $file = $_FILES['user_upload'];
                 AnnouncementManager::edit_announcement(
                     $id,
                     $emailTitle,
@@ -383,11 +380,11 @@ if (api_is_allowed_to_edit(false,true) OR
                 if ($_POST['email_ann'] && empty($_POST['onlyThoseMails'])) {
                     AnnouncementManager::send_email($id, $sendToUsersInSession);
                 }
-				$message = get_lang('AnnouncementModified');
-			}
-		} else {
-			//insert mode
-			if ($ctok == $_POST['sec_token']) {
+                $message = get_lang('AnnouncementModified');
+            }
+        } else {
+            //insert mode
+            if ($ctok == $_POST['sec_token']) {
                 $file = $_FILES['user_upload'];
                 $file_comment = $_POST['file_comment'];
                 if (!empty($group_id)) {
@@ -419,28 +416,28 @@ if (api_is_allowed_to_edit(false,true) OR
                     AnnouncementManager::send_email($insert_id, $sendToUsersInSession);
                 }
 
-			} // end condition token
-		}	// isset
+            } // end condition token
+        }	// isset
 
-		// UNSET VARIABLES
-		unset($form_elements);
-		$_SESSION['formelements']=null;
+        // UNSET VARIABLES
+        unset($form_elements);
+        $_SESSION['formelements']=null;
 
-		$newContent = null;
-		$emailTitle = null;
+        $newContent = null;
+        $emailTitle = null;
 
-		unset($emailTitle);
-		unset($newContent);
-		unset($content_to_modify);
-		unset($title_to_modify);
+        unset($emailTitle);
+        unset($newContent);
+        unset($content_to_modify);
+        unset($title_to_modify);
 
-	}	// if $submit Announcement
+    }	// if $submit Announcement
 }
 
 /*  	Tool introduction  */
 
 if (empty($_GET['origin']) || $_GET['origin'] !== 'learnpath') {
-	Display::display_introduction_section(TOOL_ANNOUNCEMENT);
+    Display::display_introduction_section(TOOL_ANNOUNCEMENT);
 }
 
 /* DISPLAY LEFT COLUMN */
@@ -450,15 +447,15 @@ $session_id = api_get_session_id();
 $condition_session = api_get_session_condition($session_id, true, true);
 
 if (api_is_allowed_to_edit(false,true))  {
- 	// check teacher status
-  	if (empty($_GET['origin']) or $_GET['origin'] !== 'learnpath') {
-
-  		if (api_get_group_id() == 0) {
-			$group_condition = "";
-		} else {
-			$group_condition = " AND (ip.to_group_id='".api_get_group_id()."' OR ip.to_group_id = 0)";
-		}
-		$sql = "SELECT announcement.*, ip.visibility, ip.to_group_id, ip.insert_user_id
+    // check teacher status
+    if (empty($_GET['origin']) or $_GET['origin'] !== 'learnpath') {
+
+        if (api_get_group_id() == 0) {
+            $group_condition = "";
+        } else {
+            $group_condition = " AND (ip.to_group_id='".api_get_group_id()."' OR ip.to_group_id = 0)";
+        }
+        $sql = "SELECT announcement.*, ip.visibility, ip.to_group_id, ip.insert_user_id
 				FROM $tbl_announcement announcement, $tbl_item_property ip
 				WHERE   announcement.c_id   = $course_id AND
                         ip.c_id             = $course_id AND
@@ -470,9 +467,9 @@ if (api_is_allowed_to_edit(false,true))  {
 				GROUP BY ip.ref
 				ORDER BY display_order DESC
 				LIMIT 0,$maximum";
-	}
+    }
 } else {
-	// students only get to see the visible announcements
+    // students only get to see the visible announcements
     if (empty($_GET['origin']) or $_GET['origin'] !== 'learnpath') {
         $group_memberships=GroupManager::get_group_ids($_course['real_id'], $_user['user_id']);
 
@@ -487,12 +484,12 @@ if (api_is_allowed_to_edit(false,true))  {
             }
         } else {
             if (api_get_group_id() == 0) {
-                    $cond_user_id = " AND ( ip.to_user_id='".$_user['user_id']."'" .
-                        "OR ip.to_group_id IN (0, ".implode(", ", $group_memberships).")) ";
-                } else {
-                    $cond_user_id = " AND ( ip.to_user_id='".$_user['user_id']."'" .
-                        "OR ip.to_group_id IN (0, ".api_get_group_id().")) ";
-                }
+                $cond_user_id = " AND ( ip.to_user_id='".$_user['user_id']."'" .
+                    "OR ip.to_group_id IN (0, ".implode(", ", $group_memberships).")) ";
+            } else {
+                $cond_user_id = " AND ( ip.to_user_id='".$_user['user_id']."'" .
+                    "OR ip.to_group_id IN (0, ".api_get_group_id().")) ";
+            }
         }
 
         // the user is member of several groups => display personal announcements AND his group announcements AND the general announcements
@@ -569,13 +566,13 @@ $announcement_number = Database::num_rows($result);
 
 $show_actions = false;
 if ((api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_edit_announcement') && !api_is_anonymous())) and (empty($_GET['origin']) or $_GET['origin'] !== 'learnpath')) {
-	echo '<div class="actions">';
-	if (isset($_GET['action']) && in_array($_GET['action'], array('add', 'modify','view'))) {
+    echo '<div class="actions">';
+    if (isset($_GET['action']) && in_array($_GET['action'], array('add', 'modify','view'))) {
         echo "<a href='".api_get_self()."?".api_get_cidreq()."&origin=".$origin."'>".Display::return_icon('back.png',get_lang('Back'),'',ICON_SIZE_MEDIUM)."</a>";
-	} else {
-	   echo "<a href='".api_get_self()."?".api_get_cidreq()."&action=add&origin=".$origin."'>".Display::return_icon('new_announce.png',get_lang('AddAnnouncement'),'',ICON_SIZE_MEDIUM)."</a>";
-	}
-	$show_actions = true;
+    } else {
+        echo "<a href='".api_get_self()."?".api_get_cidreq()."&action=add&origin=".$origin."'>".Display::return_icon('new_announce.png',get_lang('AddAnnouncement'),'',ICON_SIZE_MEDIUM)."</a>";
+    }
+    $show_actions = true;
 } else {
     if (in_array($_GET['action'], array('view'))) {
         echo '<div class="actions">';
@@ -585,14 +582,14 @@ if ((api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_e
 }
 
 if (api_is_allowed_to_edit() && $announcement_number > 1) {
-	if (api_get_group_id() == 0 ) {
-		if (!$show_actions)
-			echo '<div class="actions">';
-			if (!isset($_GET['action'])) {
-                echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&action=delete_all\" onclick=\"javascript:if(!confirm('".get_lang("ConfirmYourChoice")."')) return false;\">".
-                    Display::return_icon('delete_announce.png',get_lang('AnnouncementDeleteAll'),'',ICON_SIZE_MEDIUM)."</a>";
-            }
-    	}	// if announcementNumber > 1
+    if (api_get_group_id() == 0 ) {
+        if (!$show_actions)
+            echo '<div class="actions">';
+        if (!isset($_GET['action'])) {
+            echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&action=delete_all\" onclick=\"javascript:if(!confirm('".get_lang("ConfirmYourChoice")."')) return false;\">".
+                Display::return_icon('delete_announce.png',get_lang('AnnouncementDeleteAll'),'',ICON_SIZE_MEDIUM)."</a>";
+        }
+    }	// if announcementNumber > 1
 }
 
 if ($show_actions)
@@ -602,14 +599,14 @@ if ($show_actions)
 //	ANNOUNCEMENTS LIST
 
 if ($message) {
-	Display::display_confirmation_message($message);
-	$display_announcement_list = true;
-	$display_form             = false;
+    Display::display_confirmation_message($message);
+    $display_announcement_list = true;
+    $display_form             = false;
 }
 if (!empty($error_message)) {
-	Display::display_error_message($error_message);
-	$display_announcement_list = false;
-	$display_form             = true;
+    Display::display_error_message($error_message);
+    $display_announcement_list = false;
+    $display_form             = true;
 }
 
 /*
@@ -618,64 +615,64 @@ if (!empty($error_message)) {
 
 if ($display_form) {
 
-	$content_to_modify 	= stripslashes($content_to_modify);
-	$title_to_modify 	= stripslashes($title_to_modify);
-
-	// DISPLAY ADD ANNOUNCEMENT COMMAND
-	//echo '<form method="post" name="f1" enctype = "multipart/form-data" action="'.api_get_self().'?publish_survey='.Security::remove_XSS($surveyid).'&id='.Security::remove_XSS($_GET['id']).'&db_name='.$db_name.'&cidReq='.Security::remove_XSS($_GET['cidReq']).'" style="margin:0px;">';
-	$id = isset($_GET['id']) ? intval($_GET['id']) : 0;
-	echo '<form class="form-horizontal" method="post" name="f1" enctype = "multipart/form-data" action="'.api_get_self().'?id='.$id.'&'.api_get_cidreq().'" style="margin:0px;">';
-	if (empty($_GET['id'])) {
-		$form_name = get_lang('AddAnnouncement');
-	} else {
-		$form_name = get_lang('ModifyAnnouncement');
-	}
-	echo '<legend>'.$form_name.'</legend>';
-
-	//this variable defines if the course administrator can send a message to a specific user / group or not
+    $content_to_modify 	= stripslashes($content_to_modify);
+    $title_to_modify 	= stripslashes($title_to_modify);
+
+    // DISPLAY ADD ANNOUNCEMENT COMMAND
+    //echo '<form method="post" name="f1" enctype = "multipart/form-data" action="'.api_get_self().'?publish_survey='.Security::remove_XSS($surveyid).'&id='.Security::remove_XSS($_GET['id']).'&db_name='.$db_name.'&cidReq='.Security::remove_XSS($_GET['cidReq']).'" style="margin:0px;">';
+    $id = isset($_GET['id']) ? intval($_GET['id']) : 0;
+    echo '<form class="form-horizontal" method="post" name="f1" enctype = "multipart/form-data" action="'.api_get_self().'?id='.$id.'&'.api_get_cidreq().'" style="margin:0px;">';
+    if (empty($_GET['id'])) {
+        $form_name = get_lang('AddAnnouncement');
+    } else {
+        $form_name = get_lang('ModifyAnnouncement');
+    }
+    echo '<legend>'.$form_name.'</legend>';
+
+    //this variable defines if the course administrator can send a message to a specific user / group or not
     //@todo use formvalidator
 
-	if (empty($group_id)) {
-		echo '	<div class="control-group">
+    if (empty($group_id)) {
+        echo '	<div class="control-group">
 					<label class="control-label">'.
-						Display::return_icon('group.png', get_lang('ModifyRecipientList'), array ('align' => 'absmiddle'),ICON_SIZE_SMALL).' '.get_lang('SentTo').'
+            Display::return_icon('group.png', get_lang('ModifyRecipientList'), array ('align' => 'absmiddle'),ICON_SIZE_SMALL).' '.get_lang('SentTo').'
 					</label>
 					<div class="controls">';
 
-		if (isset($_GET['remind_inactive'])) {
-			$email_ann = '1';
-			$_SESSION['select_groupusers']="show";
-			$content_to_modify = sprintf(get_lang('RemindInactiveLearnersMailContent'), api_get_setting('siteName'), 7);
-			$title_to_modify = sprintf(get_lang('RemindInactiveLearnersMailSubject'), api_get_setting('siteName'));
-		} elseif (isset($_GET['remindallinactives']) && $_GET['remindallinactives']=='true') {
-			// we want to remind inactive users. The $_GET['since'] parameter determines which users have to be warned (i.e the users who have been inactive for x days or more
-			$since = isset($_GET['since']) ? intval($_GET['since']) : 6;
-			// getting the users who have to be reminded
-			$to = Tracking :: get_inactives_students_in_course($_course['id'],$since, api_get_session_id());
-			// setting the variables for the form elements: the users who need to receive the message
-			foreach($to as &$user) {
-				$user = 'USER:'.$user;
-			}
-			// setting the variables for the form elements: the 'visible to' form element has to be expanded
-			$_SESSION['select_groupusers']="show";
-			// setting the variables for the form elements: the message has to be sent by email
-			$email_ann = '1';
-			// setting the variables for the form elements: the title of the email
-			//$title_to_modify = sprintf(get_lang('RemindInactiveLearnersMailSubject'), api_get_setting('siteName'),' > ',$_course['name']);
-			$title_to_modify = sprintf(get_lang('RemindInactiveLearnersMailSubject'), api_get_setting('siteName'));
-			// setting the variables for the form elements: the message of the email
-			//$content_to_modify = sprintf(get_lang('RemindInactiveLearnersMailContent'),api_get_setting('siteName'),' > ',$_course['name'],$since);
-			$content_to_modify = sprintf(get_lang('RemindInactiveLearnersMailContent'),api_get_setting('siteName'),$since);
-			// when we want to remind the users who have never been active then we have a different subject and content for the announcement
-			if ($_GET['since'] == 'never') {
-				$title_to_modify = sprintf(get_lang('RemindInactiveLearnersMailSubject'), api_get_setting('siteName'));
-				$content_to_modify = get_lang('YourAccountIsActiveYouCanLoginAndCheckYourCourses');
-			}
-		} else {
-			//echo '<span id="recipient_overview">' . get_lang('Everybody') . '</span>';
-		}
-		AnnouncementManager::show_to_form($to);
-		echo '		</div>
+        if (isset($_GET['remind_inactive'])) {
+            $email_ann = '1';
+            $_SESSION['select_groupusers']="show";
+            $content_to_modify = sprintf(get_lang('RemindInactiveLearnersMailContent'), api_get_setting('siteName'), 7);
+            $title_to_modify = sprintf(get_lang('RemindInactiveLearnersMailSubject'), api_get_setting('siteName'));
+        } elseif (isset($_GET['remindallinactives']) && $_GET['remindallinactives']=='true') {
+            // we want to remind inactive users. The $_GET['since'] parameter determines which users have to be warned (i.e the users who have been inactive for x days or more
+            $since = isset($_GET['since']) ? intval($_GET['since']) : 6;
+            // getting the users who have to be reminded
+            $to = Tracking :: get_inactives_students_in_course($_course['id'],$since, api_get_session_id());
+            // setting the variables for the form elements: the users who need to receive the message
+            foreach($to as &$user) {
+                $user = 'USER:'.$user;
+            }
+            // setting the variables for the form elements: the 'visible to' form element has to be expanded
+            $_SESSION['select_groupusers']="show";
+            // setting the variables for the form elements: the message has to be sent by email
+            $email_ann = '1';
+            // setting the variables for the form elements: the title of the email
+            //$title_to_modify = sprintf(get_lang('RemindInactiveLearnersMailSubject'), api_get_setting('siteName'),' > ',$_course['name']);
+            $title_to_modify = sprintf(get_lang('RemindInactiveLearnersMailSubject'), api_get_setting('siteName'));
+            // setting the variables for the form elements: the message of the email
+            //$content_to_modify = sprintf(get_lang('RemindInactiveLearnersMailContent'),api_get_setting('siteName'),' > ',$_course['name'],$since);
+            $content_to_modify = sprintf(get_lang('RemindInactiveLearnersMailContent'),api_get_setting('siteName'),$since);
+            // when we want to remind the users who have never been active then we have a different subject and content for the announcement
+            if ($_GET['since'] == 'never') {
+                $title_to_modify = sprintf(get_lang('RemindInactiveLearnersMailSubject'), api_get_setting('siteName'));
+                $content_to_modify = get_lang('YourAccountIsActiveYouCanLoginAndCheckYourCourses');
+            }
+        } else {
+            //echo '<span id="recipient_overview">' . get_lang('Everybody') . '</span>';
+        }
+        AnnouncementManager::show_to_form($to);
+        echo '		</div>
 					</div>';
 
         if (api_get_session_id() == 0) {
@@ -684,7 +681,7 @@ if ($display_form) {
             echo '</div></div>';
         }
 
-		if (!isset($announcement_to_modify) ) $announcement_to_modify ='';
+        if (!isset($announcement_to_modify) ) $announcement_to_modify ='';
 
         ($email_ann=='1')?$checked='checked':$checked='';
         echo '	<div class="control-group">
@@ -695,10 +692,10 @@ if ($display_form) {
                 </div>';
 
 
-	} else {
-		if (!isset($announcement_to_modify) ) {
-			$announcement_to_modify ="";
-		}
+    } else {
+        if (!isset($announcement_to_modify) ) {
+            $announcement_to_modify ="";
+        }
 
         ($email_ann=='1' || !empty($surveyid))?$checked='checked':$checked='';
         echo '<div class="control-group">
@@ -706,12 +703,12 @@ if ($display_form) {
               <input class="checkbox" type="checkbox" value="1" name="email_ann" '.$checked.'>
               '.get_lang('EmailOption').': <span id="recipient_overview">'.get_lang('MyGroup').'</span>
               <a href="#" onclick="toggle_sendto();">'.get_lang('ModifyRecipientList').'</a>';
-              AnnouncementManager::show_to_form_group($group_id);
+        AnnouncementManager::show_to_form_group($group_id);
         echo '</div></div>';
-	}
+    }
 
-	// the announcement title
-	echo '	<div class="control-group">
+    // the announcement title
+    echo '	<div class="control-group">
 				<div id="msg_error" style="display:none;color:red;margin-left:20%"></div>
 				<label class="control-label">
 					<span class="form_required">*</span> '.get_lang('EmailTitle').'
@@ -721,36 +718,36 @@ if ($display_form) {
 				</div>
 			</div>';
 
-	unset($title_to_modify);
-	$title_to_modify = null;
+    unset($title_to_modify);
+    $title_to_modify = null;
 
-	if (!isset($announcement_to_modify) ) $announcement_to_modify ="";
-	if (!isset($content_to_modify) ) 		$content_to_modify ="";
-	if (!isset($title_to_modify)) 		$title_to_modify = "";
+    if (!isset($announcement_to_modify) ) $announcement_to_modify ="";
+    if (!isset($content_to_modify) ) 		$content_to_modify ="";
+    if (!isset($title_to_modify)) 		$title_to_modify = "";
 
-	echo '<input type="hidden" name="id" value="'.$announcement_to_modify.'" />';
+    echo '<input type="hidden" name="id" value="'.$announcement_to_modify.'" />';
 
     $oFCKeditor = new FCKeditor('newContent') ;
-	$oFCKeditor->Width		= '100%';
-	$oFCKeditor->Height		= '300';
+    $oFCKeditor->Width		= '100%';
+    $oFCKeditor->Height		= '300';
 
-	if(!api_is_allowed_to_edit()) {
-		$oFCKeditor->ToolbarSet = "AnnouncementsStudent";
-	} else {
-		$oFCKeditor->ToolbarSet = "Announcements";
-	}
+    if(!api_is_allowed_to_edit()) {
+        $oFCKeditor->ToolbarSet = "AnnouncementsStudent";
+    } else {
+        $oFCKeditor->ToolbarSet = "Announcements";
+    }
 
-	$oFCKeditor->Value		= $content_to_modify;
+    $oFCKeditor->Value		= $content_to_modify;
 
-	echo '<div class="row"><div class="formw">';
+    echo '<div class="row"><div class="formw">';
 
-	echo Display::display_normal_message(get_lang('Tags').' <br /><br />'.implode('<br />', AnnouncementManager::get_tags()), false);
+    echo Display::display_normal_message(get_lang('Tags').' <br /><br />'.implode('<br />', AnnouncementManager::get_tags()), false);
 
-	echo $oFCKeditor->CreateHtml();
-	echo '</div></div>';
+    echo $oFCKeditor->CreateHtml();
+    echo '</div></div>';
 
     //File attachment
-	echo '	<div class="control-group">
+    echo '	<div class="control-group">
 				<div class="controls">
 				    <a href="javascript://" onclick="return plus_attachment();"><span id="plus"><img style="vertical-align:middle;" src="../img/div_show.gif" alt="" />&nbsp;'.get_lang('AddAnAttachment').'</span></a>
 				    <br />
@@ -771,24 +768,24 @@ if ($display_form) {
 			 </div>
 			</div>';
 
-	echo'<br />';
-	echo '<div class="row"><div class="formw">';
-
-	if (empty($group_id)) {
-		echo '<input type="hidden" name="submitAnnouncement" value="OK">';
-		echo '<input type="hidden" name="sec_token" value="'.$stok.'" />';
-		echo '<button class="btn save" type="button"  value="'.'  '.get_lang('Send').'  '.'" onclick="selectAll(this.form.elements[4],true)" >'.get_lang('ButtonPublishAnnouncement').'</button><br /><br />';
-	} else {
-		echo '<input type="hidden" name="submitAnnouncement" value="OK">';
-		echo '<input type="hidden" name="sec_token" value="'.$stok.'" />';
-		echo '<button class="btn save" type="button"  value="'.'  '.get_lang('Send').'  '.'" onclick="selectAll(this.form.elements[4],true)" >'.get_lang('ButtonPublishAnnouncement').'</button><br /><br />';
-	}
-	echo '</div></div>';
-	echo '</form><br />';
-
-	if ((isset($_GET['action']) && isset($_GET['id']) && is_array($to))||isset($_GET['remindallinactives'])||isset($_GET['remind_inactive'])) {
-		echo '<script>toggle_sendto();</script>';
-	}
+    echo'<br />';
+    echo '<div class="row"><div class="formw">';
+
+    if (empty($group_id)) {
+        echo '<input type="hidden" name="submitAnnouncement" value="OK">';
+        echo '<input type="hidden" name="sec_token" value="'.$stok.'" />';
+        echo '<button class="btn save" type="button"  value="'.'  '.get_lang('Send').'  '.'" onclick="selectAll(this.form.elements[4],true)" >'.get_lang('ButtonPublishAnnouncement').'</button><br /><br />';
+    } else {
+        echo '<input type="hidden" name="submitAnnouncement" value="OK">';
+        echo '<input type="hidden" name="sec_token" value="'.$stok.'" />';
+        echo '<button class="btn save" type="button"  value="'.'  '.get_lang('Send').'  '.'" onclick="selectAll(this.form.elements[4],true)" >'.get_lang('ButtonPublishAnnouncement').'</button><br /><br />';
+    }
+    echo '</div></div>';
+    echo '</form><br />';
+
+    if ((isset($_GET['action']) && isset($_GET['id']) && is_array($to))||isset($_GET['remindallinactives'])||isset($_GET['remind_inactive'])) {
+        echo '<script>toggle_sendto();</script>';
+    }
 
 } // end of displayform for announcement creation/edition
 
@@ -799,29 +796,29 @@ $course_id = api_get_course_int_id();
 
 //if ($display_announcement_list && !$surveyid) {
 if ($display_announcement_list) {
-	// by default we use the id of the current user. The course administrator can see the announcement of other users by using the user / group filter
-	//$user_id=$_user['user_id'];
-	if (isset($_SESSION['user'])) {
-		//$user_id=$_SESSION['user'];
-	}
-	$user_id = api_get_user_id();
+    // by default we use the id of the current user. The course administrator can see the announcement of other users by using the user / group filter
+    //$user_id=$_user['user_id'];
+    if (isset($_SESSION['user'])) {
+        //$user_id=$_SESSION['user'];
+    }
+    $user_id = api_get_user_id();
 
-	if (isset($_SESSION['group'])) {
-		//$group_id=$_SESSION['group'];
-	}
-	$group_id = api_get_group_id();
+    if (isset($_SESSION['group'])) {
+        //$group_id=$_SESSION['group'];
+    }
+    $group_id = api_get_group_id();
 
-	$group_memberships = GroupManager::get_group_ids($course_id, api_get_user_id());
+    $group_memberships = GroupManager::get_group_ids($course_id, api_get_user_id());
 
-	//$is_group_member = GroupManager :: is_tutor(api_get_user_id());
+    //$is_group_member = GroupManager :: is_tutor(api_get_user_id());
 
-	if (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_edit_announcement') && !api_is_anonymous())) {
-		// A.1. you are a course admin with a USER filter
-		// => see only the messages of this specific user + the messages of the group (s)he is member of.
-		if (!empty($_SESSION['user'])) {
+    if (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_edit_announcement') && !api_is_anonymous())) {
+        // A.1. you are a course admin with a USER filter
+        // => see only the messages of this specific user + the messages of the group (s)he is member of.
+        if (!empty($_SESSION['user'])) {
 
-			if (is_array($group_memberships) && count($group_memberships) > 0 ) {
-				$sql = "SELECT announcement.*, ip.visibility, ip.to_group_id, ip.insert_user_id, ip.insert_date
+            if (is_array($group_memberships) && count($group_memberships) > 0 ) {
+                $sql = "SELECT announcement.*, ip.visibility, ip.to_group_id, ip.insert_user_id, ip.insert_date
 					FROM $tbl_announcement announcement, $tbl_item_property ip
 					WHERE 	announcement.c_id = $course_id AND
 							ip.c_id = $course_id AND
@@ -832,8 +829,8 @@ if ($display_announcement_list) {
 
 					ORDER BY display_order DESC";
 
-			} else {
-				$sql = "SELECT announcement.*, ip.visibility, ip.to_group_id, ip.insert_user_id, ip.insert_date
+            } else {
+                $sql = "SELECT announcement.*, ip.visibility, ip.to_group_id, ip.insert_user_id, ip.insert_date
 					FROM $tbl_announcement announcement, $tbl_item_property ip
 					WHERE	announcement.c_id 	= $course_id AND
 							ip.c_id 			= $course_id AND
@@ -844,11 +841,11 @@ if ($display_announcement_list) {
 					$condition_session
 					ORDER BY display_order DESC";
 
-			}
-		} elseif (api_get_group_id() != 0 ) {
-			// A.2. you are a course admin with a GROUP filter
-			// => see only the messages of this specific group
-			$sql="SELECT announcement.*, ip.visibility, ip.to_group_id, ip.insert_user_id, ip.insert_date
+            }
+        } elseif (api_get_group_id() != 0 ) {
+            // A.2. you are a course admin with a GROUP filter
+            // => see only the messages of this specific group
+            $sql="SELECT announcement.*, ip.visibility, ip.to_group_id, ip.insert_user_id, ip.insert_date
 				FROM $tbl_announcement announcement, $tbl_item_property ip
 				WHERE	announcement.c_id = $course_id AND
 						ip.c_id = $course_id AND
@@ -859,14 +856,14 @@ if ($display_announcement_list) {
 						$condition_session
 				GROUP BY ip.ref
 				ORDER BY display_order DESC";
-		} else {
+        } else {
 
-			// A.3 you are a course admin without any group or user filter
-			// A.3.a you are a course admin without user or group filter but WITH studentview
-			// => see all the messages of all the users and groups without editing possibilities
+            // A.3 you are a course admin without any group or user filter
+            // A.3.a you are a course admin without user or group filter but WITH studentview
+            // => see all the messages of all the users and groups without editing possibilities
 
-			if (isset($isStudentView) and $isStudentView=="true") {
-				$sql="SELECT
+            if (isset($isStudentView) and $isStudentView=="true") {
+                $sql="SELECT
 					announcement.*, ip.visibility, ip.to_group_id, ip.insert_user_id, ip.insert_date
 					FROM $tbl_announcement announcement, $tbl_item_property ip
 					WHERE	announcement.c_id = $course_id AND
@@ -877,10 +874,10 @@ if ($display_announcement_list) {
 							$condition_session
 					GROUP BY ip.ref
 					ORDER BY display_order DESC";
-			} else {
-				// A.3.a you are a course admin without user or group filter and WTIHOUT studentview (= the normal course admin view)
-				// => see all the messages of all the users and groups with editing possibilities
-				 $sql = "SELECT announcement.*, ip.visibility, ip.to_group_id, ip.insert_user_id, ip.insert_date
+            } else {
+                // A.3.a you are a course admin without user or group filter and WTIHOUT studentview (= the normal course admin view)
+                // => see all the messages of all the users and groups with editing possibilities
+                $sql = "SELECT announcement.*, ip.visibility, ip.to_group_id, ip.insert_user_id, ip.insert_date
 					FROM $tbl_announcement announcement, $tbl_item_property ip
 					WHERE 	announcement.c_id = $course_id AND
 							ip.c_id = $course_id AND
@@ -890,32 +887,32 @@ if ($display_announcement_list) {
 							$condition_session
 					GROUP BY ip.ref
 					ORDER BY display_order DESC";
-			}
-		}
-	} else {
-		//STUDENT
-
-		if (is_array($group_memberships) && count($group_memberships)>0) {
-			if ((api_get_course_setting('allow_user_edit_announcement') && !api_is_anonymous())) {
-				if (api_get_group_id() == 0) {
-					//No group
-					$cond_user_id = " AND (ip.lastedit_user_id = '".api_get_user_id()."' OR ( ip.to_user_id='".$_user['user_id']."'" .
-									" OR ip.to_group_id IN (0, ".implode(", ", $group_memberships)."))) ";
-				} else {
-					$cond_user_id = " AND (ip.lastedit_user_id = '".api_get_user_id()."'
+            }
+        }
+    } else {
+        //STUDENT
+
+        if (is_array($group_memberships) && count($group_memberships)>0) {
+            if ((api_get_course_setting('allow_user_edit_announcement') && !api_is_anonymous())) {
+                if (api_get_group_id() == 0) {
+                    //No group
+                    $cond_user_id = " AND (ip.lastedit_user_id = '".api_get_user_id()."' OR ( ip.to_user_id='".$_user['user_id']."'" .
+                        " OR ip.to_group_id IN (0, ".implode(", ", $group_memberships)."))) ";
+                } else {
+                    $cond_user_id = " AND (ip.lastedit_user_id = '".api_get_user_id()."'
 					OR ip.to_group_id IN (0, ".api_get_group_id()."))";
-				}
-				//$cond_user_id = " AND (ip.lastedit_user_id = '".api_get_user_id()."' OR (ip.to_user_id=$user_id OR ip.to_group_id IN (0, ".implode(", ", $group_memberships).") )) ";
-
-			} else {
-				if (api_get_group_id() == 0) {
-					$cond_user_id = " AND (ip.to_user_id=$user_id OR ip.to_group_id IN (0, ".implode(", ", $group_memberships).")) ";
-				} else {
-					$cond_user_id = " AND (ip.to_user_id=$user_id OR ip.to_group_id IN (0, ".api_get_group_id()."))";
-				}
-			}
-
-			$sql = "SELECT announcement.*, ip.visibility, ip.to_group_id, ip.insert_user_id, ip.insert_date
+                }
+                //$cond_user_id = " AND (ip.lastedit_user_id = '".api_get_user_id()."' OR (ip.to_user_id=$user_id OR ip.to_group_id IN (0, ".implode(", ", $group_memberships).") )) ";
+
+            } else {
+                if (api_get_group_id() == 0) {
+                    $cond_user_id = " AND (ip.to_user_id=$user_id OR ip.to_group_id IN (0, ".implode(", ", $group_memberships).")) ";
+                } else {
+                    $cond_user_id = " AND (ip.to_user_id=$user_id OR ip.to_group_id IN (0, ".api_get_group_id()."))";
+                }
+            }
+
+            $sql = "SELECT announcement.*, ip.visibility, ip.to_group_id, ip.insert_user_id, ip.insert_date
     				FROM $tbl_announcement announcement, $tbl_item_property ip
     				WHERE	announcement.c_id = $course_id AND
 							ip.c_id = $course_id AND
@@ -925,15 +922,15 @@ if ($display_announcement_list) {
 	        				$condition_session
 	        				AND ip.visibility='1'
     				ORDER BY display_order DESC";
-		} else {
-			if ($_user['user_id']) {
-				if ((api_get_course_setting('allow_user_edit_announcement') && !api_is_anonymous())) {
-					$cond_user_id = " AND (ip.lastedit_user_id = '".api_get_user_id()."' OR (ip.to_user_id='".$_user['user_id']."' OR ip.to_group_id='0')) ";
-				} else {
-					$cond_user_id = " AND (ip.to_user_id='".$_user['user_id']."' OR ip.to_group_id='0') ";
-				}
-
-				$sql = "SELECT announcement.*, ip.visibility, ip.to_group_id, ip.insert_user_id, ip.insert_date
+        } else {
+            if ($_user['user_id']) {
+                if ((api_get_course_setting('allow_user_edit_announcement') && !api_is_anonymous())) {
+                    $cond_user_id = " AND (ip.lastedit_user_id = '".api_get_user_id()."' OR (ip.to_user_id='".$_user['user_id']."' OR ip.to_group_id='0')) ";
+                } else {
+                    $cond_user_id = " AND (ip.to_user_id='".$_user['user_id']."' OR ip.to_group_id='0') ";
+                }
+
+                $sql = "SELECT announcement.*, ip.visibility, ip.to_group_id, ip.insert_user_id, ip.insert_date
 						FROM $tbl_announcement announcement, $tbl_item_property ip
 						WHERE
     						announcement.c_id = $course_id AND
@@ -945,15 +942,15 @@ if ($display_announcement_list) {
     						AND ip.visibility='1'
     						AND announcement.session_id IN(0,".api_get_session_id().")
 						ORDER BY display_order DESC";
-			} else {
+            } else {
 
-				if ((api_get_course_setting('allow_user_edit_announcement') && !api_is_anonymous())) {
-					$cond_user_id = " AND (ip.lastedit_user_id = '".api_get_user_id()."' OR ip.to_group_id='0' ) ";
-				} else {
-					$cond_user_id = " AND ip.to_group_id='0' ";
-				}
+                if ((api_get_course_setting('allow_user_edit_announcement') && !api_is_anonymous())) {
+                    $cond_user_id = " AND (ip.lastedit_user_id = '".api_get_user_id()."' OR ip.to_group_id='0' ) ";
+                } else {
+                    $cond_user_id = " AND ip.to_group_id='0' ";
+                }
 
-				$sql = "SELECT announcement.*, ip.visibility, ip.to_group_id, ip.insert_user_id, ip.insert_date
+                $sql = "SELECT announcement.*, ip.visibility, ip.to_group_id, ip.insert_user_id, ip.insert_date
 						FROM $tbl_announcement announcement, $tbl_item_property ip
 						WHERE
 						announcement.c_id = $course_id AND
@@ -964,140 +961,140 @@ if ($display_announcement_list) {
 						$condition_session
 						AND ip.visibility='1'
 						AND announcement.session_id IN(0,".api_get_session_id().")";
-			}
-		}
-	}
+            }
+        }
+    }
 
-	$result		= Database::query($sql);
-	$num_rows 	= Database::num_rows($result);
+    $result		= Database::query($sql);
+    $num_rows 	= Database::num_rows($result);
 
     // DISPLAY: NO ITEMS
 
-	if (!isset($_GET['action']) || !in_array($_GET['action'], array('add', 'modify','view')))
-	if ($num_rows == 0) {
-		if ((api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_edit_announcement') && !api_is_anonymous())) and (empty($_GET['origin']) or $_GET['origin'] !== 'learnpath')) {
-	        echo '<div id="no-data-view">';
-            echo '<h2>'.get_lang('Announcements').'</h2>';
-            echo Display::return_icon('valves.png', '', array(), 64);
-            echo '<div class="controls">';
-            echo Display::url(get_lang('AddAnnouncement'), api_get_self()."?".api_get_cidreq()."&action=add&origin=".$origin, array('class' => 'btn'));
-            echo '</div>';
-            echo '</div>';
-        } else {
-            //echo "<a href='".api_get_self()."?".api_get_cidreq()."&action=add&origin=".(empty($_GET['origin'])?'':$_GET['origin'])."'>".Display::return_icon('new_announce.png',get_lang('AddAnnouncement'),'',ICON_SIZE_MEDIUM)."</a>";
-           Display::display_warning_message(get_lang('NoAnnouncements'));
-        }
+    if (!isset($_GET['action']) || !in_array($_GET['action'], array('add', 'modify','view')))
+        if ($num_rows == 0) {
+            if ((api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_edit_announcement') && !api_is_anonymous())) and (empty($_GET['origin']) or $_GET['origin'] !== 'learnpath')) {
+                echo '<div id="no-data-view">';
+                echo '<h2>'.get_lang('Announcements').'</h2>';
+                echo Display::return_icon('valves.png', '', array(), 64);
+                echo '<div class="controls">';
+                echo Display::url(get_lang('AddAnnouncement'), api_get_self()."?".api_get_cidreq()."&action=add&origin=".$origin, array('class' => 'btn'));
+                echo '</div>';
+                echo '</div>';
+            } else {
+                //echo "<a href='".api_get_self()."?".api_get_cidreq()."&action=add&origin=".(empty($_GET['origin'])?'':$_GET['origin'])."'>".Display::return_icon('new_announce.png',get_lang('AddAnnouncement'),'',ICON_SIZE_MEDIUM)."</a>";
+                Display::display_warning_message(get_lang('NoAnnouncements'));
+            }
 
-	} else {
-    	$iterator = 1;
-    	$bottomAnnouncement = $announcement_number;
-
-    	echo '<table width="100%" class="data_table announcements-list">';
-        $ths = Display::tag('th', get_lang('Title'));
-        $ths .= Display::tag('th', get_lang('By') );
-        $ths .= Display::tag('th', get_lang('LastUpdateDate') );
-        if (api_is_allowed_to_edit(false,true) OR (api_is_course_coach() && api_is_element_in_the_session(TOOL_ANNOUNCEMENT,$myrow['id']))
-                 OR (api_get_course_setting('allow_user_edit_announcement') && !api_is_anonymous())) {
-            $ths .= Display::tag('th', get_lang('Modify'));
-        }
+        } else {
+            $iterator = 1;
+            $bottomAnnouncement = $announcement_number;
+
+            echo '<table width="100%" class="data_table announcements-list">';
+            $ths = Display::tag('th', get_lang('Title'));
+            $ths .= Display::tag('th', get_lang('By') );
+            $ths .= Display::tag('th', get_lang('LastUpdateDate') );
+            if (api_is_allowed_to_edit(false,true) OR (api_is_course_coach() && api_is_element_in_the_session(TOOL_ANNOUNCEMENT,$myrow['id']))
+                OR (api_get_course_setting('allow_user_edit_announcement') && !api_is_anonymous())) {
+                $ths .= Display::tag('th', get_lang('Modify'));
+            }
 
-    	echo Display::tag('tr', $ths);
-    	$displayed = array();
+            echo Display::tag('tr', $ths);
+            $displayed = array();
 
-    	while ($myrow = Database::fetch_array($result, 'ASSOC')) {
-    		if (!in_array($myrow['id'], $displayed)) {
-    		    $sent_to_icon = '';
-		       // the email icon
-                if ($myrow['email_sent'] == '1') {
-                    $sent_to_icon = ' '.Display::return_icon('email.gif', get_lang('AnnounceSentByEmail'));
-                }
+            while ($myrow = Database::fetch_array($result, 'ASSOC')) {
+                if (!in_array($myrow['id'], $displayed)) {
+                    $sent_to_icon = '';
+                    // the email icon
+                    if ($myrow['email_sent'] == '1') {
+                        $sent_to_icon = ' '.Display::return_icon('email.gif', get_lang('AnnounceSentByEmail'));
+                    }
 
-    			$title		 = $myrow['title'].$sent_to_icon;
+                    $title		 = $myrow['title'].$sent_to_icon;
 
-    			/* DATE */
-    			$last_post_datetime = $myrow['end_date'];
+                    /* DATE */
+                    $last_post_datetime = $myrow['end_date'];
 
-                $item_visibility = api_get_item_visibility($_course, TOOL_ANNOUNCEMENT, $myrow['id'], $session_id);
-                $myrow['visibility'] = $item_visibility;
+                    $item_visibility = api_get_item_visibility($_course, TOOL_ANNOUNCEMENT, $myrow['id'], $session_id);
+                    $myrow['visibility'] = $item_visibility;
 
-    			// the styles
-    			if ($myrow['visibility'] == '0') {
-    				$style='invisible';
-    			} else {
-    				$style = '';
-    			}
+                    // the styles
+                    if ($myrow['visibility'] == '0') {
+                        $style='invisible';
+                    } else {
+                        $style = '';
+                    }
 
-    			echo '<tr class="announcements-list-line">';
+                    echo '<tr class="announcements-list-line">';
 
-    		    // show attachment list
-                $attachment_list = array();
-                $attachment_list = AnnouncementManager::get_attachment($myrow['id']);
+                    // show attachment list
+                    $attachment_list = array();
+                    $attachment_list = AnnouncementManager::get_attachment($myrow['id']);
 
-                $attachment_icon = '';
-                if (count($attachment_list)>0) {
-                    $attachment_icon = ' '.Display::return_icon('attachment.gif',get_lang('Attachment'));
-                }
+                    $attachment_icon = '';
+                    if (count($attachment_list)>0) {
+                        $attachment_icon = ' '.Display::return_icon('attachment.gif',get_lang('Attachment'));
+                    }
 
-                /* TITLE */
-    		    $title = Display::url($title.$attachment_icon, api_get_self().'?'.api_get_cidreq().'&action=view&id='.$myrow['id']);
-                echo Display::tag('td', Security::remove_XSS($title), array('class' => 'announcements-list-line-title '.$style));
-
-                $user_info		= api_get_user_info($myrow['insert_user_id']);
-                $username       = sprintf(get_lang("LoginX"), $user_info['username']);
-                $username_span  = Display::tag('span', api_get_person_name($user_info['firstName'], $user_info['lastName']), array('title'=>$username));
-    			echo Display::tag('td', $username_span, array('class' => 'announcements-list-line-by-user'));
-                echo Display::tag('td', api_convert_and_format_date($myrow['insert_date'], DATE_TIME_FORMAT_LONG), array('class' => 'announcements-list-line-datetime'));
-
-    			// we can edit if : we are the teacher OR the element belongs to the session we are coaching OR the option to allow users to edit is on
-    			$modify_icons = '';
-    			if (api_is_allowed_to_edit(false,true) OR (api_is_course_coach() && api_is_element_in_the_session(TOOL_ANNOUNCEMENT, $myrow['id']))
-    			     OR (api_get_course_setting('allow_user_edit_announcement') && !api_is_anonymous())) {
-
-    				$modify_icons = "<a href=\"".api_get_self()."?".api_get_cidreq()."&action=modify&id=".$myrow['id']."\">".Display::return_icon('edit.png', get_lang('Edit'),'',ICON_SIZE_SMALL)."</a>";
-    				if ($myrow['visibility']==1) {
-    					$image_visibility="visible";
-    					$alt_visibility=get_lang('Hide');
-    				} else {
-    					$image_visibility="invisible";
-    					$alt_visibility=get_lang('Visible');
-    				}
-    				$modify_icons .=  "<a href=\"".api_get_self()."?".api_get_cidreq()."&origin=".$origin."&action=showhide&id=".$myrow['id']."&sec_token=".$stok."\">".
-    						Display::return_icon($image_visibility.'.png', $alt_visibility,'',ICON_SIZE_SMALL)."</a>";
-
-    				// DISPLAY MOVE UP COMMAND only if it is not the top announcement
-    				if ($iterator != 1) {
-    					$modify_icons .= "<a href=\"".api_get_self()."?".api_get_cidreq()."&up=".$myrow["id"]."&sec_token=".$stok."\">".Display::return_icon('up.gif', get_lang('Up'))."</a>";
-    				} else {
-    				    $modify_icons .= Display::return_icon('up_na.gif', get_lang('Up'));
-    				}
-    				if ($iterator < $bottomAnnouncement) {
-    					$modify_icons .= "<a href=\"".api_get_self()."?".api_get_cidreq()."&down=".$myrow["id"]."&sec_token=".$stok."\">".Display::return_icon('down.gif', get_lang('Down'))."</a>";
-    				} else {
-    				    $modify_icons .= Display::return_icon('down_na.gif', get_lang('Down'));
-    				}
-    			    if (api_is_allowed_to_edit(false,true)) {
-                        $modify_icons .= "<a href=\"".api_get_self()."?".api_get_cidreq()."&action=delete&id=".$myrow['id']."&sec_token=".$stok."\" onclick=\"javascript:if(!confirm('".addslashes(api_htmlentities(get_lang('ConfirmYourChoice'),ENT_QUOTES,$charset))."')) return false;\">".
-                            Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL).
-                            "</a>";
+                    /* TITLE */
+                    $title = Display::url($title.$attachment_icon, api_get_self().'?'.api_get_cidreq().'&action=view&id='.$myrow['id']);
+                    echo Display::tag('td', Security::remove_XSS($title), array('class' => 'announcements-list-line-title '.$style));
+
+                    $user_info		= api_get_user_info($myrow['insert_user_id']);
+                    $username       = sprintf(get_lang("LoginX"), $user_info['username']);
+                    $username_span  = Display::tag('span', api_get_person_name($user_info['firstName'], $user_info['lastName']), array('title'=>$username));
+                    echo Display::tag('td', $username_span, array('class' => 'announcements-list-line-by-user'));
+                    echo Display::tag('td', api_convert_and_format_date($myrow['insert_date'], DATE_TIME_FORMAT_LONG), array('class' => 'announcements-list-line-datetime'));
+
+                    // we can edit if : we are the teacher OR the element belongs to the session we are coaching OR the option to allow users to edit is on
+                    $modify_icons = '';
+                    if (api_is_allowed_to_edit(false,true) OR (api_is_course_coach() && api_is_element_in_the_session(TOOL_ANNOUNCEMENT, $myrow['id']))
+                        OR (api_get_course_setting('allow_user_edit_announcement') && !api_is_anonymous())) {
+
+                        $modify_icons = "<a href=\"".api_get_self()."?".api_get_cidreq()."&action=modify&id=".$myrow['id']."\">".Display::return_icon('edit.png', get_lang('Edit'),'',ICON_SIZE_SMALL)."</a>";
+                        if ($myrow['visibility']==1) {
+                            $image_visibility="visible";
+                            $alt_visibility=get_lang('Hide');
+                        } else {
+                            $image_visibility="invisible";
+                            $alt_visibility=get_lang('Visible');
+                        }
+                        $modify_icons .=  "<a href=\"".api_get_self()."?".api_get_cidreq()."&origin=".$origin."&action=showhide&id=".$myrow['id']."&sec_token=".$stok."\">".
+                            Display::return_icon($image_visibility.'.png', $alt_visibility,'',ICON_SIZE_SMALL)."</a>";
+
+                        // DISPLAY MOVE UP COMMAND only if it is not the top announcement
+                        if ($iterator != 1) {
+                            $modify_icons .= "<a href=\"".api_get_self()."?".api_get_cidreq()."&up=".$myrow["id"]."&sec_token=".$stok."\">".Display::return_icon('up.gif', get_lang('Up'))."</a>";
+                        } else {
+                            $modify_icons .= Display::return_icon('up_na.gif', get_lang('Up'));
+                        }
+                        if ($iterator < $bottomAnnouncement) {
+                            $modify_icons .= "<a href=\"".api_get_self()."?".api_get_cidreq()."&down=".$myrow["id"]."&sec_token=".$stok."\">".Display::return_icon('down.gif', get_lang('Down'))."</a>";
+                        } else {
+                            $modify_icons .= Display::return_icon('down_na.gif', get_lang('Down'));
+                        }
+                        if (api_is_allowed_to_edit(false,true)) {
+                            $modify_icons .= "<a href=\"".api_get_self()."?".api_get_cidreq()."&action=delete&id=".$myrow['id']."&sec_token=".$stok."\" onclick=\"javascript:if(!confirm('".addslashes(api_htmlentities(get_lang('ConfirmYourChoice'),ENT_QUOTES,$charset))."')) return false;\">".
+                                Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL).
+                                "</a>";
+                        }
+                        $iterator ++;
+                        echo Display::tag('td', $modify_icons, array('class' => 'announcements-list-line-actions'));
                     }
-    				$iterator ++;
-    				echo Display::tag('td', $modify_icons, array('class' => 'announcements-list-line-actions'));
-    			}
-    			echo "</tr>";
-    		}
-    		$displayed[]=$myrow['id'];
-    	}	// end while
-    	echo "</table>";
-	}
+                    echo "</tr>";
+                }
+                $displayed[]=$myrow['id'];
+            }	// end while
+            echo "</table>";
+        }
 }	// end: if ($displayAnnoucementList)
 
 
 if (isset($_GET['action']) && $_GET['action'] == 'view') {
-	AnnouncementManager::display_announcement($announcement_id);
+    AnnouncementManager::display_announcement($announcement_id);
 }
 
 /*		FOOTER		*/
 if (empty($_GET['origin']) or $_GET['origin'] !== 'learnpath') {
-	//we are not in learnpath tool
-	Display::display_footer();
+    //we are not in learnpath tool
+    Display::display_footer();
 }
diff --git a/main/announcements/download.php b/main/announcements/download.php
index 67ffa25045..cdefb0d93c 100755
--- a/main/announcements/download.php
+++ b/main/announcements/download.php
@@ -1,17 +1,13 @@
 <?php
 /* For licensing terms, see /license.txt */
 /**
-*	This file is responsible for  passing requested documents to the browser.
-*	Html files are parsed to fix a few problems with URLs,
-*	but this code will hopefully be replaced soon by an Apache URL
-*	rewrite mechanism.
-*
-*	@package chamilo.announcements
-*/
-
-/*
-		MAIN CODE
-*/
+ *	This file is responsible for  passing requested documents to the browser.
+ *	Html files are parsed to fix a few problems with URLs,
+ *	but this code will hopefully be replaced soon by an Apache URL
+ *	rewrite mechanism.
+ *
+ *	@package chamilo.announcements
+ */
 
 session_cache_limiter('nocache');
 
@@ -34,25 +30,25 @@ $doc_url = str_replace(' ', '+', $doc_url);
 $doc_url = str_replace('/..', '', $doc_url); //echo $doc_url;
 
 if (strpos($doc_url,'../') OR strpos($doc_url,'/..')) {
-   $doc_url = '';
+    $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/announcements/'.$doc_url;
 
 //if the rewrite rule asks for a directory, we redirect to the document explorer
 if (is_dir($full_file_name)) {
-	//remove last slash if present
-	//$doc_url = ($doc_url{strlen($doc_url)-1}=='/')?substr($doc_url,0,strlen($doc_url)-1):$doc_url;
-	//mod_rewrite can change /some/path/ to /some/path// in some cases, so clean them all off (René)
-	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
+    //$doc_url = ($doc_url{strlen($doc_url)-1}=='/')?substr($doc_url,0,strlen($doc_url)-1):$doc_url;
+    //mod_rewrite can change /some/path/ to /some/path// in some cases, so clean them all off (René)
+    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);
 }
 
 $tbl_announcement_attachment = Database::get_course_table(TABLE_ANNOUNCEMENT_ATTACHMENT);
@@ -71,8 +67,10 @@ $result= Database::query($sql);
 if (Database::num_rows($result) > 0) {
     $row= Database::fetch_array($result);
     $title = str_replace(' ','_', $row['filename']);
-    if (Security::check_abs_path($full_file_name, api_get_path(SYS_COURSE_PATH).api_get_course_path().'/upload/announcements/')) {  
+    if (Security::check_abs_path($full_file_name,
+        api_get_path(SYS_COURSE_PATH) . api_get_course_path() . '/upload/announcements/')
+    ) {
         DocumentManager::file_send_for_download($full_file_name,TRUE, $title);
     }
 }
-exit;
\ No newline at end of file
+exit;
diff --git a/main/gradebook/exercise_jump.php b/main/gradebook/exercise_jump.php
index 625c6505e7..7d8261548e 100755
--- a/main/gradebook/exercise_jump.php
+++ b/main/gradebook/exercise_jump.php
@@ -9,9 +9,6 @@
  * @author Bert Steppé
  * @package chamilo.gradebook
  */
-/**
- * Init
- */
 
 require_once '../inc/global.inc.php';
 api_block_anonymous_users();
@@ -39,12 +36,12 @@ $_course['name'] = $course_title;
 $_course['official_code'] = $course_code;
 
 if (isset($_GET['doexercise'])) {
-	header('Location: '.$doExerciseUrl);
-	exit;
+    header('Location: '.$doExerciseUrl);
+    exit;
 } else {
-	if (isset($_GET['gradebook'])) {
-		$add_url = '&gradebook=view&exerciseId='.intval($_GET['exerciseId']);
-	}
-	header('Location: '.api_get_path(WEB_CODE_PATH).'exercice/overview.php?session_id='.$session_id.'&cidReq='.Security::remove_XSS($cidReq).'&'.$add_url);
-	exit;
+    if (isset($_GET['gradebook'])) {
+        $add_url = '&gradebook=view&exerciseId='.intval($_GET['exerciseId']);
+    }
+    header('Location: '.api_get_path(WEB_CODE_PATH).'exercice/overview.php?session_id='.$session_id.'&cidReq='.Security::remove_XSS($cidReq).'&'.$add_url);
+    exit;
 }
diff --git a/main/gradebook/gradebook.php b/main/gradebook/gradebook.php
index 2d254f3bc4..976e233086 100755
--- a/main/gradebook/gradebook.php
+++ b/main/gradebook/gradebook.php
@@ -4,9 +4,7 @@
  * Script
  * @package chamilo.gradebook
  */
-/**
- * Init
- */
+
 $language_file= 'gradebook';
 // $cidReset : This is the main difference with gradebook.php, here we say,
 // basically, that we are inside a course, and many things depend from that
@@ -15,12 +13,12 @@ $_in_course = false;
 //make sure the destination for scripts is index.php instead of gradebook.php
 require_once '../inc/global.inc.php';
 if (!empty($_GET['course'])) {
-	$_SESSION['gradebook_dest'] = 'index.php';	
-	$this_section = SECTION_COURSES;
+    $_SESSION['gradebook_dest'] = 'index.php';
+    $this_section = SECTION_COURSES;
 } else {
-	$_SESSION['gradebook_dest'] = 'gradebook.php';	
-	$this_section = SECTION_MYGRADEBOOK;
-	unset($_GET['course']);
+    $_SESSION['gradebook_dest'] = 'gradebook.php';
+    $this_section = SECTION_MYGRADEBOOK;
+    unset($_GET['course']);
 }
 require_once 'lib/be.inc.php';
 require_once 'lib/scoredisplay.class.php';
@@ -60,541 +58,541 @@ $filter_warning_msg = true;
 
 //this is called when there is no data for the course admin
 if (isset ($_GET['createallcategories'])) {
-	block_students();
-	$coursecat= Category :: get_not_created_course_categories(api_get_user_id());
-	if (!count($coursecat) == 0) {
-		foreach ($coursecat as $row) {
-			$cat= new Category();
-			$cat->set_name($row[1]);
-			$cat->set_course_code($row[0]);
-			$cat->set_description(null);
-			$cat->set_user_id(api_get_user_id());
-			$cat->set_parent_id(0);
-			$cat->set_weight(0);
-			$cat->set_visible(0);
-			$cat->add();
-			unset ($cat);
-		}
-	}
-	header('Location: '.$_SESSION['gradebook_dest'].'?addallcat=&selectcat=0');
-	exit;
+    block_students();
+    $coursecat= Category :: get_not_created_course_categories(api_get_user_id());
+    if (!count($coursecat) == 0) {
+        foreach ($coursecat as $row) {
+            $cat= new Category();
+            $cat->set_name($row[1]);
+            $cat->set_course_code($row[0]);
+            $cat->set_description(null);
+            $cat->set_user_id(api_get_user_id());
+            $cat->set_parent_id(0);
+            $cat->set_weight(0);
+            $cat->set_visible(0);
+            $cat->add();
+            unset ($cat);
+        }
+    }
+    header('Location: '.$_SESSION['gradebook_dest'].'?addallcat=&selectcat=0');
+    exit;
 }
 //move a category
 $selectcat=isset($_GET['selectcat']) ?  Security::remove_XSS($_GET['selectcat']) : '';
 
 if (isset ($_GET['movecat'])) {
-	$move_cat=Security::remove_XSS($_GET['movecat']);
-	block_students();
-	$cats= Category :: load($move_cat);
-	if (!isset ($_GET['targetcat'])) {
-		$move_form= new CatForm(CatForm :: TYPE_MOVE,
-								$cats[0],
-								'move_cat_form',
-								null,
-								api_get_self() . '?movecat=' . $move_cat
-													 . '&selectcat=' . Security::remove_XSS($_GET['selectcat']));
-		if ($move_form->validate()) {
-			header('Location: ' . api_get_self() . '?selectcat=' . Security::remove_XSS($_GET['selectcat'])
-													   . '&movecat=' . $move_cat
-													   . '&targetcat=' . $move_form->exportValue('move_cat'));
-			exit;
-		}
-	} else {
-		$get_target_cat=Security::remove_XSS($_GET['targetcat']);
-		$targetcat= Category :: load($get_target_cat);
-		$course_to_crsind = ($cats[0]->get_course_code() != null && $targetcat[0]->get_course_code() == null);
+    $move_cat=Security::remove_XSS($_GET['movecat']);
+    block_students();
+    $cats= Category :: load($move_cat);
+    if (!isset ($_GET['targetcat'])) {
+        $move_form= new CatForm(CatForm :: TYPE_MOVE,
+            $cats[0],
+            'move_cat_form',
+            null,
+            api_get_self() . '?movecat=' . $move_cat
+            . '&selectcat=' . Security::remove_XSS($_GET['selectcat']));
+        if ($move_form->validate()) {
+            header('Location: ' . api_get_self() . '?selectcat=' . Security::remove_XSS($_GET['selectcat'])
+                . '&movecat=' . $move_cat
+                . '&targetcat=' . $move_form->exportValue('move_cat'));
+            exit;
+        }
+    } else {
+        $get_target_cat=Security::remove_XSS($_GET['targetcat']);
+        $targetcat= Category :: load($get_target_cat);
+        $course_to_crsind = ($cats[0]->get_course_code() != null && $targetcat[0]->get_course_code() == null);
 
-		if (!($course_to_crsind && !isset($_GET['confirm']))) {
-			$cats[0]->move_to_cat($targetcat[0]);
-			header('Location: ' . api_get_self() . '?categorymoved=&selectcat=' . Security::remove_XSS($_GET['selectcat']));
-			exit;
-		}
-		unset ($targetcat);
-	}
-	unset ($cats);
+        if (!($course_to_crsind && !isset($_GET['confirm']))) {
+            $cats[0]->move_to_cat($targetcat[0]);
+            header('Location: ' . api_get_self() . '?categorymoved=&selectcat=' . Security::remove_XSS($_GET['selectcat']));
+            exit;
+        }
+        unset ($targetcat);
+    }
+    unset ($cats);
 }
 
 //move an evaluation
 if (isset ($_GET['moveeval'])) {
-	block_students();
-	$get_move_eval=Security::remove_XSS($_GET['moveeval']);
-	$evals= Evaluation :: load($get_move_eval);
-	if (!isset ($_GET['targetcat'])) {
+    block_students();
+    $get_move_eval=Security::remove_XSS($_GET['moveeval']);
+    $evals= Evaluation :: load($get_move_eval);
+    if (!isset ($_GET['targetcat'])) {
 
-		$move_form= new EvalForm(EvalForm :: TYPE_MOVE,
-								 $evals[0],
-								 null,
-								 'move_eval_form',
-								 null,
-								 api_get_self() . '?moveeval=' . $get_move_eval
-								 					  . '&selectcat=' . Security::remove_XSS($_GET['selectcat']));
+        $move_form= new EvalForm(EvalForm :: TYPE_MOVE,
+            $evals[0],
+            null,
+            'move_eval_form',
+            null,
+            api_get_self() . '?moveeval=' . $get_move_eval
+            . '&selectcat=' . Security::remove_XSS($_GET['selectcat']));
 
-		if ($move_form->validate()) {
-			header('Location: ' .api_get_self() . '?selectcat=' . Security::remove_XSS($_GET['selectcat'])
-													   . '&moveeval=' . $get_move_eval
-													   . '&targetcat=' . $move_form->exportValue('move_cat'));
-			exit;
-		}
-	} else {
-		$get_target_cat=Security::remove_XSS($_GET['targetcat']);
-		$targetcat= Category :: load($get_target_cat);
-		$course_to_crsind = ($evals[0]->get_course_code() != null && $targetcat[0]->get_course_code() == null);
+        if ($move_form->validate()) {
+            header('Location: ' .api_get_self() . '?selectcat=' . Security::remove_XSS($_GET['selectcat'])
+                . '&moveeval=' . $get_move_eval
+                . '&targetcat=' . $move_form->exportValue('move_cat'));
+            exit;
+        }
+    } else {
+        $get_target_cat=Security::remove_XSS($_GET['targetcat']);
+        $targetcat= Category :: load($get_target_cat);
+        $course_to_crsind = ($evals[0]->get_course_code() != null && $targetcat[0]->get_course_code() == null);
 
-		if (!($course_to_crsind && !isset($_GET['confirm']))) {
-			$evals[0]->move_to_cat($targetcat[0]);
-			header('Location: ' . api_get_self() . '?evaluationmoved=&selectcat=' . Security::remove_XSS($_GET['selectcat']));
-			exit;
-		}
-		unset ($targetcat);
-	}
-	unset ($evals);
+        if (!($course_to_crsind && !isset($_GET['confirm']))) {
+            $evals[0]->move_to_cat($targetcat[0]);
+            header('Location: ' . api_get_self() . '?evaluationmoved=&selectcat=' . Security::remove_XSS($_GET['selectcat']));
+            exit;
+        }
+        unset ($targetcat);
+    }
+    unset ($evals);
 }
 
 //move a link
 if (isset ($_GET['movelink'])) {
-	block_students();
-	$get_move_link=Security::remove_XSS($_GET['movelink']);
-	$link= LinkFactory :: load($get_move_link);
-	$move_form= new LinkForm(LinkForm :: TYPE_MOVE, null, $link[0], 'move_link_form', null, api_get_self() . '?movelink=' . $get_move_link . '&selectcat=' . Security::remove_XSS($_GET['selectcat']));
-	if ($move_form->validate()) {
-		$targetcat= Category :: load($move_form->exportValue('move_cat'));
-		$link[0]->move_to_cat($targetcat[0]);
-		unset ($link);
-		header('Location: ' . api_get_self(). '?linkmoved=&selectcat=' . Security::remove_XSS($_GET['selectcat']));
-		exit;
-	}
+    block_students();
+    $get_move_link=Security::remove_XSS($_GET['movelink']);
+    $link= LinkFactory :: load($get_move_link);
+    $move_form= new LinkForm(LinkForm :: TYPE_MOVE, null, $link[0], 'move_link_form', null, api_get_self() . '?movelink=' . $get_move_link . '&selectcat=' . Security::remove_XSS($_GET['selectcat']));
+    if ($move_form->validate()) {
+        $targetcat= Category :: load($move_form->exportValue('move_cat'));
+        $link[0]->move_to_cat($targetcat[0]);
+        unset ($link);
+        header('Location: ' . api_get_self(). '?linkmoved=&selectcat=' . Security::remove_XSS($_GET['selectcat']));
+        exit;
+    }
 }
 
 //parameters for categories
 if (isset ($_GET['visiblecat'])) {
-	block_students();
-	if (isset ($_GET['set_visible'])) {
-		$visibility_command= 1;
-	} else {
-		$visibility_command= 0;
-	}
-	$cats= Category :: load($_GET['visiblecat']);
-	$cats[0]->set_visible($visibility_command);
-	$cats[0]->save();
-	$cats[0]->apply_visibility_to_children();
-	unset ($cats);
-	if ($visibility_command) {
-		$confirmation_message = get_lang('ViMod');
-		$filter_confirm_msg = false;
-	} else {
-		$confirmation_message = get_lang('InViMod');
-		$filter_confirm_msg = false;
-	}
+    block_students();
+    if (isset ($_GET['set_visible'])) {
+        $visibility_command= 1;
+    } else {
+        $visibility_command= 0;
+    }
+    $cats= Category :: load($_GET['visiblecat']);
+    $cats[0]->set_visible($visibility_command);
+    $cats[0]->save();
+    $cats[0]->apply_visibility_to_children();
+    unset ($cats);
+    if ($visibility_command) {
+        $confirmation_message = get_lang('ViMod');
+        $filter_confirm_msg = false;
+    } else {
+        $confirmation_message = get_lang('InViMod');
+        $filter_confirm_msg = false;
+    }
 }
 if (isset ($_GET['deletecat'])) {
-	block_students();
-	$cats= Category :: load($_GET['deletecat']);
-	//delete all categories,subcategories and results
-	if ($cats[0] != null) {
-		if ($cats[0]->get_id() != 0) {
-			// better don't try to delete the root...
-			$cats[0]->delete_all();
-		}
-	}
-	$confirmation_message = get_lang('CategoryDeleted');
-	$filter_confirm_msg = false;
+    block_students();
+    $cats= Category :: load($_GET['deletecat']);
+    //delete all categories,subcategories and results
+    if ($cats[0] != null) {
+        if ($cats[0]->get_id() != 0) {
+            // better don't try to delete the root...
+            $cats[0]->delete_all();
+        }
+    }
+    $confirmation_message = get_lang('CategoryDeleted');
+    $filter_confirm_msg = false;
 }
 //parameters for evaluations
 if (isset ($_GET['visibleeval'])) {
-	block_students();
-	if (isset ($_GET['set_visible'])) {
-		$visibility_command= 1;
-	} else {
-		$visibility_command= 0;
-	}
+    block_students();
+    if (isset ($_GET['set_visible'])) {
+        $visibility_command= 1;
+    } else {
+        $visibility_command= 0;
+    }
 
-	$eval= Evaluation :: load($_GET['visibleeval']);
-	$eval[0]->set_visible($visibility_command);
-	$eval[0]->save();
-	unset ($eval);
-	if ($visibility_command) {
-		$confirmation_message = get_lang('ViMod');
-		$filter_confirm_msg = false;
-	} else {
-		$confirmation_message = get_lang('InViMod');
-		$filter_confirm_msg = false;
-	}
+    $eval= Evaluation :: load($_GET['visibleeval']);
+    $eval[0]->set_visible($visibility_command);
+    $eval[0]->save();
+    unset ($eval);
+    if ($visibility_command) {
+        $confirmation_message = get_lang('ViMod');
+        $filter_confirm_msg = false;
+    } else {
+        $confirmation_message = get_lang('InViMod');
+        $filter_confirm_msg = false;
+    }
 }
 if (isset ($_GET['deleteeval'])) {
-	block_students();
-	$eval= Evaluation :: load($_GET['deleteeval']);
-	if ($eval[0] != null) {
-		$eval[0]->delete_with_results();
-	}
-	$confirmation_message = get_lang('GradebookEvaluationDeleted');
-	$filter_confirm_msg = false;
+    block_students();
+    $eval= Evaluation :: load($_GET['deleteeval']);
+    if ($eval[0] != null) {
+        $eval[0]->delete_with_results();
+    }
+    $confirmation_message = get_lang('GradebookEvaluationDeleted');
+    $filter_confirm_msg = false;
 }
 //parameters for links
 if (isset ($_GET['visiblelink'])) {
-	block_students();
-	if (isset ($_GET['set_visible'])) {
-		$visibility_command= 1;
-	}else {
-		$visibility_command= 0;
-	}
-	$link= LinkFactory :: load($_GET['visiblelink']);
-	$link[0]->set_visible($visibility_command);
-	$link[0]->save();
-	unset ($link);
-	if ($visibility_command) {
-		$confirmation_message = get_lang('ViMod');
-		$filter_confirm_msg = false;
-	} else {
-		$confirmation_message = get_lang('InViMod');
-		$filter_confirm_msg = false;
-	}
+    block_students();
+    if (isset ($_GET['set_visible'])) {
+        $visibility_command= 1;
+    }else {
+        $visibility_command= 0;
+    }
+    $link= LinkFactory :: load($_GET['visiblelink']);
+    $link[0]->set_visible($visibility_command);
+    $link[0]->save();
+    unset ($link);
+    if ($visibility_command) {
+        $confirmation_message = get_lang('ViMod');
+        $filter_confirm_msg = false;
+    } else {
+        $confirmation_message = get_lang('InViMod');
+        $filter_confirm_msg = false;
+    }
 }
 if (isset ($_GET['deletelink'])) {
-	block_students();
-	//fixing #5229
-	if (!empty($_GET['deletelink'])) {	
-		$link= LinkFactory :: load($_GET['deletelink']);
-		if ($link[0] != null) {
-			$link[0]->delete();
-		}
-		unset ($link);
-		$confirmation_message = get_lang('LinkDeleted');
-		$filter_confirm_msg = false;
-	}
+    block_students();
+    //fixing #5229
+    if (!empty($_GET['deletelink'])) {
+        $link= LinkFactory :: load($_GET['deletelink']);
+        if ($link[0] != null) {
+            $link[0]->delete();
+        }
+        unset ($link);
+        $confirmation_message = get_lang('LinkDeleted');
+        $filter_confirm_msg = false;
+    }
 }
 $course_to_crsind = isset ($course_to_crsind) ? $course_to_crsind : '';
 if ($course_to_crsind && !isset($_GET['confirm'])) {
-	block_students();
-	if (!isset($_GET['movecat']) && !isset($_GET['moveeval'])) {
-		die ('Error: movecat or moveeval not defined');
-	}
-	$button = '<form name="confirm"
+    block_students();
+    if (!isset($_GET['movecat']) && !isset($_GET['moveeval'])) {
+        die ('Error: movecat or moveeval not defined');
+    }
+    $button = '<form name="confirm"
 					 method="post"
 					 action="'.api_get_self() .'?confirm='
-													.(isset($_GET['movecat']) ? '&movecat=' . Security::remove_XSS($_GET['movecat'])
-																			  : '&moveeval=' . Security::remove_XSS($_GET['moveeval']) )
-													.'&selectcat=' . Security::remove_XSS($_GET['selectcat'])
-													.'&targetcat=' . Security::remove_XSS($_GET['targetcat']).'">
+        .(isset($_GET['movecat']) ? '&movecat=' . Security::remove_XSS($_GET['movecat'])
+            : '&moveeval=' . Security::remove_XSS($_GET['moveeval']) )
+        .'&selectcat=' . Security::remove_XSS($_GET['selectcat'])
+        .'&targetcat=' . Security::remove_XSS($_GET['targetcat']).'">
 			   <input type="submit" value="'.'  '.get_lang('Ok').'  '.'">
 			   </form>';
 
-	$warning_message = get_lang('MoveWarning').'<br><br>'.$button;
-	$filter_warning_msg = false;
+    $warning_message = get_lang('MoveWarning').'<br><br>'.$button;
+    $filter_warning_msg = false;
 }
 //actions on the sortabletable
 if (isset ($_POST['action'])) {
-	block_students();
-	$number_of_selected_items= count($_POST['id']);
-	if ($number_of_selected_items == '0') {
-		$warning_message = get_lang('NoItemsSelected');
-		$filter_warning_msg = false;
-	}
-	else {
-		switch ($_POST['action']) {
-			case 'deleted' :
-				$number_of_deleted_categories= 0;
-				$number_of_deleted_evaluations= 0;
-				$number_of_deleted_links= 0;
-				foreach ($_POST['id'] as $indexstr) {
-					if (api_substr($indexstr, 0, 4) == 'CATE') {
-						$cats= Category :: load(api_substr($indexstr, 4));
-						if ($cats[0] != null) {
-							$cats[0]->delete_all();
-						}
-						$number_of_deleted_categories++;
-					}
-					if (api_substr($indexstr, 0, 4) == 'EVAL') {
-						$eval= Evaluation :: load(api_substr($indexstr, 4));
-						if ($eval[0] != null) {
-						$eval[0]->delete_with_results();
-						}
-						$number_of_deleted_evaluations++;
-					}
-					if (api_substr($indexstr, 0, 4) == 'LINK') {
-						$id = api_substr($indexstr, 4);
-						if (!empty($id)) {
-							$link= LinkFactory :: load();
-							if ($link[0] != null) {
-								$link[0]->delete();
-							}
-							$number_of_deleted_links++;
-						}
-					}
-				}
-				$confirmation_message = get_lang('DeletedCategories') . ' : <b>' . $number_of_deleted_categories . '</b><br />' . get_lang('DeletedEvaluations') . ' : <b>' . $number_of_deleted_evaluations . '</b><br />' . get_lang('DeletedLinks') . ' : <b>' . $number_of_deleted_links . '</b><br /><br />' . get_lang('TotalItems') . ' : <b>' . $number_of_selected_items . '</b>';
-				$filter_confirm_msg = false;
-				break;
-			case 'setvisible' :
-				foreach ($_POST['id'] as $indexstr)
-				{
-					if (api_substr($indexstr, 0, 4) == 'CATE')
-					{
-						$cats= Category :: load(api_substr($indexstr, 4));
-						$cats[0]->set_visible(1);
-						$cats[0]->save();
-						$cats[0]->apply_visibility_to_children();
-					}
-					if (api_substr($indexstr, 0, 4) == 'EVAL')
-					{
-						$eval= Evaluation :: load(api_substr($indexstr, 4));
-						$eval[0]->set_visible(1);
-						$eval[0]->save();
-					}
-					if (api_substr($indexstr, 0, 4) == 'LINK')
-					{
-						$link= LinkFactory :: load(api_substr($indexstr, 4));
-						$link[0]->set_visible(1);
-						$link[0]->save();
-					}
-				}
-				$confirmation_message = get_lang('ItemsVisible');
-				$filter_confirm_msg = false;
-				break;
-			case 'setinvisible' :
-				foreach ($_POST['id'] as $indexstr)
-				{
-					if (api_substr($indexstr, 0, 4) == 'CATE')
-					{
-						$cats= Category :: load(api_substr($indexstr, 4));
-						$cats[0]->set_visible(0);
-						$cats[0]->save();
-						$cats[0]->apply_visibility_to_children();
-					}
-					if (api_substr($indexstr, 0, 4) == 'EVAL')
-					{
-						$eval= Evaluation :: load(api_substr($indexstr, 4));
-						$eval[0]->set_visible(0);
-						$eval[0]->save();
-					}
-					if (api_substr($indexstr, 0, 4) == 'LINK')
-					{
-						$link= LinkFactory :: load(api_substr($indexstr, 4));
-						$link[0]->set_visible(0);
-						$link[0]->save();
-					}
-				}
-				$confirmation_message = get_lang('ItemsInVisible');
-				$filter_confirm_msg = false;
-				break;
-		}
-	}
+    block_students();
+    $number_of_selected_items= count($_POST['id']);
+    if ($number_of_selected_items == '0') {
+        $warning_message = get_lang('NoItemsSelected');
+        $filter_warning_msg = false;
+    }
+    else {
+        switch ($_POST['action']) {
+            case 'deleted' :
+                $number_of_deleted_categories= 0;
+                $number_of_deleted_evaluations= 0;
+                $number_of_deleted_links= 0;
+                foreach ($_POST['id'] as $indexstr) {
+                    if (api_substr($indexstr, 0, 4) == 'CATE') {
+                        $cats= Category :: load(api_substr($indexstr, 4));
+                        if ($cats[0] != null) {
+                            $cats[0]->delete_all();
+                        }
+                        $number_of_deleted_categories++;
+                    }
+                    if (api_substr($indexstr, 0, 4) == 'EVAL') {
+                        $eval= Evaluation :: load(api_substr($indexstr, 4));
+                        if ($eval[0] != null) {
+                            $eval[0]->delete_with_results();
+                        }
+                        $number_of_deleted_evaluations++;
+                    }
+                    if (api_substr($indexstr, 0, 4) == 'LINK') {
+                        $id = api_substr($indexstr, 4);
+                        if (!empty($id)) {
+                            $link= LinkFactory :: load();
+                            if ($link[0] != null) {
+                                $link[0]->delete();
+                            }
+                            $number_of_deleted_links++;
+                        }
+                    }
+                }
+                $confirmation_message = get_lang('DeletedCategories') . ' : <b>' . $number_of_deleted_categories . '</b><br />' . get_lang('DeletedEvaluations') . ' : <b>' . $number_of_deleted_evaluations . '</b><br />' . get_lang('DeletedLinks') . ' : <b>' . $number_of_deleted_links . '</b><br /><br />' . get_lang('TotalItems') . ' : <b>' . $number_of_selected_items . '</b>';
+                $filter_confirm_msg = false;
+                break;
+            case 'setvisible' :
+                foreach ($_POST['id'] as $indexstr)
+                {
+                    if (api_substr($indexstr, 0, 4) == 'CATE')
+                    {
+                        $cats= Category :: load(api_substr($indexstr, 4));
+                        $cats[0]->set_visible(1);
+                        $cats[0]->save();
+                        $cats[0]->apply_visibility_to_children();
+                    }
+                    if (api_substr($indexstr, 0, 4) == 'EVAL')
+                    {
+                        $eval= Evaluation :: load(api_substr($indexstr, 4));
+                        $eval[0]->set_visible(1);
+                        $eval[0]->save();
+                    }
+                    if (api_substr($indexstr, 0, 4) == 'LINK')
+                    {
+                        $link= LinkFactory :: load(api_substr($indexstr, 4));
+                        $link[0]->set_visible(1);
+                        $link[0]->save();
+                    }
+                }
+                $confirmation_message = get_lang('ItemsVisible');
+                $filter_confirm_msg = false;
+                break;
+            case 'setinvisible' :
+                foreach ($_POST['id'] as $indexstr)
+                {
+                    if (api_substr($indexstr, 0, 4) == 'CATE')
+                    {
+                        $cats= Category :: load(api_substr($indexstr, 4));
+                        $cats[0]->set_visible(0);
+                        $cats[0]->save();
+                        $cats[0]->apply_visibility_to_children();
+                    }
+                    if (api_substr($indexstr, 0, 4) == 'EVAL')
+                    {
+                        $eval= Evaluation :: load(api_substr($indexstr, 4));
+                        $eval[0]->set_visible(0);
+                        $eval[0]->save();
+                    }
+                    if (api_substr($indexstr, 0, 4) == 'LINK')
+                    {
+                        $link= LinkFactory :: load(api_substr($indexstr, 4));
+                        $link[0]->set_visible(0);
+                        $link[0]->save();
+                    }
+                }
+                $confirmation_message = get_lang('ItemsInVisible');
+                $filter_confirm_msg = false;
+                break;
+        }
+    }
 }
 
 if (isset ($_POST['submit']) && isset ($_POST['keyword'])) {
-	header('Location: ' . api_get_self() . '?selectcat=' . Security::remove_XSS($_GET['selectcat'])
-											   . '&search='.Security::remove_XSS($_POST['keyword']));
-	exit;
+    header('Location: ' . api_get_self() . '?selectcat=' . Security::remove_XSS($_GET['selectcat'])
+        . '&search='.Security::remove_XSS($_POST['keyword']));
+    exit;
 }
 // DISPLAY HEADERS AND MESSAGES                           -
 
 if (!isset($_GET['exportpdf']) and !isset($_GET['export_certificate'])) {
-	if (isset ($_GET['studentoverview'])) {
-		$interbreadcrumb[]= array (
-			'url' => $_SESSION['gradebook_dest'].'?selectcat=' . Security::remove_XSS($_GET['selectcat']),
-			'name' => get_lang('ToolGradebook')
-		);
-		Display :: display_header(get_lang('FlatView'));
-	} elseif (isset ($_GET['search'])) {		
-		if ($_SESSION['gradebook_dest'] == 'index.php') {
-			$gradebook_dest = Security::remove_XSS($_SESSION['gradebook_dest']).'?cidReq='.Security::remove_XSS($_GET['course']).'&amp;';	
-		} else {
-			$gradebook_dest = Security::remove_XSS($_SESSION['gradebook_dest']);
-		}	
-		
-		$interbreadcrumb[]= array ('url' => $gradebook_dest,'name' => get_lang('Gradebook'));
+    if (isset ($_GET['studentoverview'])) {
+        $interbreadcrumb[]= array (
+            'url' => $_SESSION['gradebook_dest'].'?selectcat=' . Security::remove_XSS($_GET['selectcat']),
+            'name' => get_lang('ToolGradebook')
+        );
+        Display :: display_header(get_lang('FlatView'));
+    } elseif (isset ($_GET['search'])) {
+        if ($_SESSION['gradebook_dest'] == 'index.php') {
+            $gradebook_dest = Security::remove_XSS($_SESSION['gradebook_dest']).'?cidReq='.Security::remove_XSS($_GET['course']).'&amp;';
+        } else {
+            $gradebook_dest = Security::remove_XSS($_SESSION['gradebook_dest']);
+        }
 
-		if ((isset($_GET['selectcat']) && $_GET['selectcat']>0)) {			
-			if (!empty($_GET['course'])) {
-				$interbreadcrumb[]= array ('url' => $gradebook_dest.'selectcat='.Security::remove_XSS($_GET['selectcat']),'name' => get_lang('Details'));	
-			} else {
-				$interbreadcrumb[]= array ('url' => $_SESSION['gradebook_dest'].'?selectcat=0','name' => get_lang('Details'));
-			}	
-		}		
-	 	Display :: display_header('');
-	} else { 
-		Display :: display_header(''); 
-	}
+        $interbreadcrumb[]= array ('url' => $gradebook_dest,'name' => get_lang('Gradebook'));
+
+        if ((isset($_GET['selectcat']) && $_GET['selectcat']>0)) {
+            if (!empty($_GET['course'])) {
+                $interbreadcrumb[]= array ('url' => $gradebook_dest.'selectcat='.Security::remove_XSS($_GET['selectcat']),'name' => get_lang('Details'));
+            } else {
+                $interbreadcrumb[]= array ('url' => $_SESSION['gradebook_dest'].'?selectcat=0','name' => get_lang('Details'));
+            }
+        }
+        Display :: display_header('');
+    } else {
+        Display :: display_header('');
+    }
 }
 
 if (isset ($_GET['categorymoved'])) {
-	Display :: display_confirmation_message(get_lang('CategoryMoved'),false);
+    Display :: display_confirmation_message(get_lang('CategoryMoved'),false);
 }
 if (isset ($_GET['evaluationmoved'])) {
-	Display :: display_confirmation_message(get_lang('EvaluationMoved'),false);
+    Display :: display_confirmation_message(get_lang('EvaluationMoved'),false);
 }
 if (isset ($_GET['linkmoved'])) {
-	Display :: display_confirmation_message(get_lang('LinkMoved'),false);
+    Display :: display_confirmation_message(get_lang('LinkMoved'),false);
 }
 if (isset ($_GET['addcat'])) {
-	Display :: display_confirmation_message(get_lang('CategoryAdded'),false);
+    Display :: display_confirmation_message(get_lang('CategoryAdded'),false);
 }
 if (isset ($_GET['linkadded'])) {
-	Display :: display_confirmation_message(get_lang('LinkAdded'),false);
+    Display :: display_confirmation_message(get_lang('LinkAdded'),false);
 }
 if (isset ($_GET['addresult'])) {
-	Display :: display_confirmation_message(get_lang('ResultAdded'),false);
+    Display :: display_confirmation_message(get_lang('ResultAdded'),false);
 }
 if (isset ($_GET['editcat'])) {
-	Display :: display_confirmation_message(get_lang('CategoryEdited'),false);
+    Display :: display_confirmation_message(get_lang('CategoryEdited'),false);
 }
 if (isset ($_GET['editeval'])) {
-	Display :: display_confirmation_message(get_lang('EvaluationEdited'),false);
+    Display :: display_confirmation_message(get_lang('EvaluationEdited'),false);
 }
 if (isset ($_GET['linkedited'])) {
-	Display :: display_confirmation_message(get_lang('LinkEdited'),false);
+    Display :: display_confirmation_message(get_lang('LinkEdited'),false);
 }
 if (isset ($_GET['nolinkitems'])) {
-	Display :: display_warning_message(get_lang('NoLinkItems'),false);
+    Display :: display_warning_message(get_lang('NoLinkItems'),false);
 }
 if (isset ($_GET['addallcat'])) {
-	Display :: display_normal_message(get_lang('AddAllCat'),false);
+    Display :: display_normal_message(get_lang('AddAllCat'),false);
 }
 if (isset ($confirmation_message)) {
-	Display :: display_confirmation_message($confirmation_message,$filter_confirm_msg);
+    Display :: display_confirmation_message($confirmation_message,$filter_confirm_msg);
 }
 if (isset ($warning_message)) {
-	Display :: display_warning_message($warning_message,$filter_warning_msg);
+    Display :: display_warning_message($warning_message,$filter_warning_msg);
 }
 if (isset ($move_form)) {
-	Display :: display_normal_message($move_form->toHtml(),false);
+    Display :: display_normal_message($move_form->toHtml(),false);
 }
 // LOAD DATA & DISPLAY TABLE                             -
 $is_platform_admin= api_is_platform_admin();
 $is_course_admin= api_is_allowed_to_edit();
 //load data for category, evaluation and links
 if (!isset ($_GET['selectcat']) || empty ($_GET['selectcat'])) {
-	$category= 0;
-	} else {
-	$category= Security::remove_XSS($_GET['selectcat']);
-	}
+    $category= 0;
+} else {
+    $category= Security::remove_XSS($_GET['selectcat']);
+}
 // search form
 
 $simple_search_form= new UserForm(UserForm :: TYPE_SIMPLE_SEARCH, null, 'simple_search_form', null, api_get_self() . '?selectcat=' . $selectcat);
 $values= $simple_search_form->exportValues();
 $keyword = '';
 if (isset($_GET['search']) && !empty($_GET['search'])) {
-	$keyword = Security::remove_XSS($_GET['search']);
+    $keyword = Security::remove_XSS($_GET['search']);
 }
 if ($simple_search_form->validate() && (empty($keyword))) {
-	$keyword = $values['keyword'];
+    $keyword = $values['keyword'];
 }
 if (!empty($keyword)) {
-    
-	$cats= Category :: load($category);
-	$allcat= array ();
-	if ((isset($_GET['selectcat']) && $_GET['selectcat']==0) && isset($_GET['search'])) {
-		$allcat= $cats[0]->get_subcategories(null);
-		$allcat_info = Category    :: find_category($keyword,$allcat);
-		$alleval=array();
-		$alllink=array();
-	} else {
-		$alleval	 = Evaluation  :: find_evaluations($keyword, $cats[0]->get_id());
-		$alllink	 = LinkFactory :: find_links($keyword, $cats[0]->get_id());
-	}
+
+    $cats= Category :: load($category);
+    $allcat= array ();
+    if ((isset($_GET['selectcat']) && $_GET['selectcat']==0) && isset($_GET['search'])) {
+        $allcat= $cats[0]->get_subcategories(null);
+        $allcat_info = Category    :: find_category($keyword,$allcat);
+        $alleval=array();
+        $alllink=array();
+    } else {
+        $alleval	 = Evaluation  :: find_evaluations($keyword, $cats[0]->get_id());
+        $alllink	 = LinkFactory :: find_links($keyword, $cats[0]->get_id());
+    }
 
 } elseif (isset ($_GET['studentoverview'])) {
-    //@todo this code seems to be deprecated because the gradebook tab is off 
-	$cats= Category :: load($category);
-	$stud_id= (api_is_allowed_to_edit() ? null : api_get_user_id());
-	$allcat= array ();
-	$alleval= $cats[0]->get_evaluations($stud_id, true);
-	$alllink= $cats[0]->get_links($stud_id, true);
-	if (isset ($_GET['exportpdf'])) {
-		$datagen = new GradebookDataGenerator ($allcat,$alleval, $alllink);
-		$header_names = array(get_lang('Name'),get_lang('Description'),get_lang('Weight'),get_lang('Date'),get_lang('Results'));
-		$data_array = $datagen->get_data(GradebookDataGenerator :: GDG_SORT_NAME,0,null,true);
-		$newarray = array();
-		foreach ($data_array as $data) {
-			$newarray[] = array_slice($data, 1);
-		}
-		$pdf= new Cezpdf(); 
-		$pdf->selectFont(api_get_path(LIBRARY_PATH).'ezpdf/fonts/Courier.afm');
-		$pdf->ezSetMargins(30, 30, 50, 30);
-		$pdf->ezSetY(810);
-		$pdf->ezText(get_lang('FlatView').' ('. api_convert_and_format_date(null, DATE_FORMAT_SHORT) . ' ' . api_convert_and_format_date(null, TIME_NO_SEC_FORMAT) .')',12,array('justification'=>'center'));
-		$pdf->line(50,790,550,790);
-		$pdf->line(50,40,550,40);
-		$pdf->ezSetY(750);
-		$pdf->ezTable($newarray,$header_names,'',array('showHeadings'=>1,'shaded'=>1,'showLines'=>1,'rowGap'=>3,'width'=> 500));
-		$pdf->ezStream();
-		exit;
-	}
+    //@todo this code seems to be deprecated because the gradebook tab is off
+    $cats= Category :: load($category);
+    $stud_id= (api_is_allowed_to_edit() ? null : api_get_user_id());
+    $allcat= array ();
+    $alleval= $cats[0]->get_evaluations($stud_id, true);
+    $alllink= $cats[0]->get_links($stud_id, true);
+    if (isset ($_GET['exportpdf'])) {
+        $datagen = new GradebookDataGenerator ($allcat,$alleval, $alllink);
+        $header_names = array(get_lang('Name'),get_lang('Description'),get_lang('Weight'),get_lang('Date'),get_lang('Results'));
+        $data_array = $datagen->get_data(GradebookDataGenerator :: GDG_SORT_NAME,0,null,true);
+        $newarray = array();
+        foreach ($data_array as $data) {
+            $newarray[] = array_slice($data, 1);
+        }
+        $pdf= new Cezpdf();
+        $pdf->selectFont(api_get_path(LIBRARY_PATH).'ezpdf/fonts/Courier.afm');
+        $pdf->ezSetMargins(30, 30, 50, 30);
+        $pdf->ezSetY(810);
+        $pdf->ezText(get_lang('FlatView').' ('. api_convert_and_format_date(null, DATE_FORMAT_SHORT) . ' ' . api_convert_and_format_date(null, TIME_NO_SEC_FORMAT) .')',12,array('justification'=>'center'));
+        $pdf->line(50,790,550,790);
+        $pdf->line(50,40,550,40);
+        $pdf->ezSetY(750);
+        $pdf->ezTable($newarray,$header_names,'',array('showHeadings'=>1,'shaded'=>1,'showLines'=>1,'rowGap'=>3,'width'=> 500));
+        $pdf->ezStream();
+        exit;
+    }
 } elseif (!empty($_GET['export_certificate'])){
     //@todo this code seems not to be used
-	$user_id = strval(intval($_GET['user']));
-	if (!api_is_allowed_to_edit(true,true)) {
-		$user_id = api_get_user_id();
-	}
-	$category = Category :: load ($_GET['cat_id']);
-	if ($category[0]->is_certificate_available($user_id)) {
-		$user= get_user_info_from_id($user_id);
-		$scoredisplay = ScoreDisplay :: instance();
-		$scorecourse = $category[0]->calc_score($user_id);
-		$scorecourse_display = (isset($scorecourse) ? $scoredisplay->display_score($scorecourse,SCORE_AVERAGE) : get_lang('NoResultsAvailable'));
+    $user_id = strval(intval($_GET['user']));
+    if (!api_is_allowed_to_edit(true,true)) {
+        $user_id = api_get_user_id();
+    }
+    $category = Category :: load ($_GET['cat_id']);
+    if ($category[0]->is_certificate_available($user_id)) {
+        $user= get_user_info_from_id($user_id);
+        $scoredisplay = ScoreDisplay :: instance();
+        $scorecourse = $category[0]->calc_score($user_id);
+        $scorecourse_display = (isset($scorecourse) ? $scoredisplay->display_score($scorecourse,SCORE_AVERAGE) : get_lang('NoResultsAvailable'));
 
-		$cattotal = Category :: load(0);
-		$scoretotal= $cattotal[0]->calc_score($user_id);
-		$scoretotal_display = (isset($scoretotal) ? $scoredisplay->display_score($scoretotal,SCORE_PERCENT) : get_lang('NoResultsAvailable'));
+        $cattotal = Category :: load(0);
+        $scoretotal= $cattotal[0]->calc_score($user_id);
+        $scoretotal_display = (isset($scoretotal) ? $scoredisplay->display_score($scoretotal,SCORE_PERCENT) : get_lang('NoResultsAvailable'));
 
-		//prepare all necessary variables:
-		$organization_name = api_get_setting('Institution');
-		$portal_name = api_get_setting('siteName');
-		$stud_fn = $user['firstname'];
-		$stud_ln = $user['lastname'];
-		$certif_text = sprintf(get_lang('CertificateWCertifiesStudentXFinishedCourseYWithGradeZ'),$organization_name,$stud_fn.' '.$stud_ln,$category[0]->get_name(),$scorecourse_display);
-		$certif_text = str_replace("\\n","\n",$certif_text);
-		$date = api_convert_and_format_date(null, DATE_FORMAT_SHORT);
+        //prepare all necessary variables:
+        $organization_name = api_get_setting('Institution');
+        $portal_name = api_get_setting('siteName');
+        $stud_fn = $user['firstname'];
+        $stud_ln = $user['lastname'];
+        $certif_text = sprintf(get_lang('CertificateWCertifiesStudentXFinishedCourseYWithGradeZ'),$organization_name,$stud_fn.' '.$stud_ln,$category[0]->get_name(),$scorecourse_display);
+        $certif_text = str_replace("\\n","\n",$certif_text);
+        $date = api_convert_and_format_date(null, DATE_FORMAT_SHORT);
 
-		$pdf= new Cezpdf('a4','landscape');
-		$pdf->selectFont(api_get_path(LIBRARY_PATH).'ezpdf/fonts/Courier.afm');
-		$pdf->ezSetMargins(30, 30, 50, 50);
-		//line Y coordinates in landscape mode are upside down (500 is on top, 10 is on the bottom)
-		$pdf->line(50,50,790,50);
-		$pdf->line(50,550,790,550);
-		$pdf->ezSetY(450);
+        $pdf= new Cezpdf('a4','landscape');
+        $pdf->selectFont(api_get_path(LIBRARY_PATH).'ezpdf/fonts/Courier.afm');
+        $pdf->ezSetMargins(30, 30, 50, 50);
+        //line Y coordinates in landscape mode are upside down (500 is on top, 10 is on the bottom)
+        $pdf->line(50,50,790,50);
+        $pdf->line(50,550,790,550);
+        $pdf->ezSetY(450);
         //@todo replace image
-		//$pdf->ezImage(api_get_path(SYS_CODE_PATH).'img/dokeos_logo_certif.png',1,400,'','center','');
-		$pdf->ezSetY(480);
-		$pdf->ezText($certif_text,28,array('justification'=>'center'));
-		//$pdf->ezSetY(750);
-		$pdf->ezSetY(50);
-		$pdf->ezText($date,18,array('justification'=>'center'));
-		$pdf->ezSetY(580);
-		$pdf->ezText($organization_name,22,array('justification'=>'left'));
-		$pdf->ezSetY(580);
-		$pdf->ezText($portal_name,22,array('justification'=>'right'));
-		$pdf->ezStream();
-	}
-	exit;
+        //$pdf->ezImage(api_get_path(SYS_CODE_PATH).'img/dokeos_logo_certif.png',1,400,'','center','');
+        $pdf->ezSetY(480);
+        $pdf->ezText($certif_text,28,array('justification'=>'center'));
+        //$pdf->ezSetY(750);
+        $pdf->ezSetY(50);
+        $pdf->ezText($date,18,array('justification'=>'center'));
+        $pdf->ezSetY(580);
+        $pdf->ezText($organization_name,22,array('justification'=>'left'));
+        $pdf->ezSetY(580);
+        $pdf->ezText($portal_name,22,array('justification'=>'right'));
+        $pdf->ezStream();
+    }
+    exit;
 } else {
-	$cats= Category :: load($category);
-	$stud_id= (api_is_allowed_to_edit() ? null : api_get_user_id());
-	$allcat= $cats[0]->get_subcategories($stud_id);
-	$alleval= $cats[0]->get_evaluations($stud_id);
-	$alllink= $cats[0]->get_links($stud_id);
+    $cats= Category :: load($category);
+    $stud_id= (api_is_allowed_to_edit() ? null : api_get_user_id());
+    $allcat= $cats[0]->get_subcategories($stud_id);
+    $alleval= $cats[0]->get_evaluations($stud_id);
+    $alllink= $cats[0]->get_links($stud_id);
 }
 $addparams = array ('selectcat' => $cats[0]->get_id());
 if (isset($_GET['search'])) {
-	$addparams['search'] = $keyword;
+    $addparams['search'] = $keyword;
 }
 if (isset ($_GET['studentoverview'])) {
-	$addparams['studentoverview'] = '';
+    $addparams['studentoverview'] = '';
 }
 if (count($allcat_info)>=0 && (isset($_GET['selectcat']) && $_GET['selectcat']==0) && isset($_GET['search']) && strlen(trim($_GET['search']))>0 ) {
-	$allcat=$allcat_info;
+    $allcat=$allcat_info;
 } else {
-	$allcat=$allcat;
+    $allcat=$allcat;
 }
 $gradebooktable= new GradebookTable($cats[0], $allcat, $alleval, $alllink, $addparams);
 if (((empty ($allcat)) && (empty ($alleval)) && (empty ($alllink)) && (!$is_platform_admin) && ($is_course_admin) && (!isset ($_GET['selectcat']))) && api_is_course_tutor()) {
-	Display :: display_normal_message(get_lang('GradebookWelcomeMessage') . '<br /><br /><form name="createcat" method="post" action="' . api_get_self() . '?createallcategories=1"><input type="submit" value="' . get_lang('CreateAllCat') . '"></form>',false);
+    Display :: display_normal_message(get_lang('GradebookWelcomeMessage') . '<br /><br /><form name="createcat" method="post" action="' . api_get_self() . '?createallcategories=1"><input type="submit" value="' . get_lang('CreateAllCat') . '"></form>',false);
 }
 //here we are in a sub category
 if ($category != '0') {
-	DisplayGradebook :: display_header_gradebook($cats[0], 1, $_GET['selectcat'], $is_course_admin, $is_platform_admin, $simple_search_form);
+    DisplayGradebook :: display_header_gradebook($cats[0], 1, $_GET['selectcat'], $is_course_admin, $is_platform_admin, $simple_search_form);
 } else {
-	//this is the root category
-	DisplayGradebook :: display_header_gradebook($cats[0], (((count($allcat) == '0') && (!isset ($_GET['search']))) ? 0 : 1), 0, $is_course_admin, $is_platform_admin, $simple_search_form);
+    //this is the root category
+    DisplayGradebook :: display_header_gradebook($cats[0], (((count($allcat) == '0') && (!isset ($_GET['search']))) ? 0 : 1), 0, $is_course_admin, $is_platform_admin, $simple_search_form);
 }
 $gradebooktable->display();
 Display :: display_footer();
diff --git a/main/gradebook/gradebook_add_cat.php b/main/gradebook/gradebook_add_cat.php
index ccd3615b23..427581c036 100755
--- a/main/gradebook/gradebook_add_cat.php
+++ b/main/gradebook/gradebook_add_cat.php
@@ -1,18 +1,17 @@
 <?php
 /* For licensing terms, see /license.txt */
+
 /**
  * Script
  * @package chamilo.gradebook
  */
-/**
- * Init
- */
+
 $language_file = 'gradebook';
 require_once '../inc/global.inc.php';
 $_in_course = true;
 $course_code = api_get_course_id();
 if ( empty ($course_code ) ) {
-	$_in_course = false;
+    $_in_course = false;
 }
 
 require_once 'lib/be.inc.php';
@@ -93,9 +92,9 @@ $catadd->set_parent_id($get_select_cat);
 $catcourse = Category :: load ($get_select_cat);
 
 if ($_in_course) {
-	$catadd->set_course_code($course_code);
+    $catadd->set_course_code($course_code);
 } else {
-	$catadd->set_course_code($catcourse[0]->get_course_code());
+    $catadd->set_course_code($catcourse[0]->get_course_code());
 }
 
 $catadd->set_course_code(api_get_course_id());
@@ -109,44 +108,44 @@ $form = new CatForm(
 );
 
 if ($form->validate()) {
-	$values = $form->exportValues();
-	$select_course=isset($values['select_course']) ? $values['select_course'] : array();
-	$cat = new Category();
-	if ($values['hid_parent_id'] == '0') {
-		if ($select_course == 'COURSEINDEPENDENT') {
-			$cat->set_name($values['name']);
-			$cat->set_course_code(null);
-		} else {
-			$cat->set_course_code($select_course);
-			$cat->set_name($values['name']);
-		}
-	} else {
-		$cat->set_name($values['name']);
-		$cat->set_course_code($values['course_code']);
-	}
+    $values = $form->exportValues();
+    $select_course=isset($values['select_course']) ? $values['select_course'] : array();
+    $cat = new Category();
+    if ($values['hid_parent_id'] == '0') {
+        if ($select_course == 'COURSEINDEPENDENT') {
+            $cat->set_name($values['name']);
+            $cat->set_course_code(null);
+        } else {
+            $cat->set_course_code($select_course);
+            $cat->set_name($values['name']);
+        }
+    } else {
+        $cat->set_name($values['name']);
+        $cat->set_course_code($values['course_code']);
+    }
 
     $cat->set_session_id(api_get_session_id());
-	//Always add the gradebook to the course
-	$cat->set_course_code(api_get_course_id());
+    //Always add the gradebook to the course
+    $cat->set_course_code(api_get_course_id());
     $cat->set_skills($values['skills']);
-	$cat->set_description($values['description']);
-	$cat->set_user_id($values['hid_user_id']);
-	$cat->set_parent_id($values['hid_parent_id']);
-	$cat->set_weight($values['weight']);
-
-	if (empty ($values['visible'])) {
-		$visible = 0;
-	} else {
-		$visible = 1;
-	}
-	$cat->set_visible($visible);
-	$result = $cat->add();
-	header('Location: '.Security::remove_XSS($_SESSION['gradebook_dest']).'?addcat=&selectcat=' . $cat->get_parent_id());
-	exit;
+    $cat->set_description($values['description']);
+    $cat->set_user_id($values['hid_user_id']);
+    $cat->set_parent_id($values['hid_parent_id']);
+    $cat->set_weight($values['weight']);
+
+    if (empty ($values['visible'])) {
+        $visible = 0;
+    } else {
+        $visible = 1;
+    }
+    $cat->set_visible($visible);
+    $result = $cat->add();
+    header('Location: '.Security::remove_XSS($_SESSION['gradebook_dest']).'?addcat=&selectcat=' . $cat->get_parent_id());
+    exit;
 }
 
 if ( !$_in_course ) {
-	$interbreadcrumb[] = array ('url' => Security::remove_XSS($_SESSION['gradebook_dest']).'?selectcat='.$get_select_cat,'name' => get_lang('Gradebook'));
+    $interbreadcrumb[] = array ('url' => Security::remove_XSS($_SESSION['gradebook_dest']).'?selectcat='.$get_select_cat,'name' => get_lang('Gradebook'));
 }
 $interbreadcrumb[]= array (	'url' =>'index.php','name' => get_lang('ToolGradebook'));
 Display :: display_header(get_lang('NewCategory'));
diff --git a/main/gradebook/gradebook_add_eval.php b/main/gradebook/gradebook_add_eval.php
index 7de17f09fd..e61bd06166 100755
--- a/main/gradebook/gradebook_add_eval.php
+++ b/main/gradebook/gradebook_add_eval.php
@@ -5,9 +5,7 @@
  * Script
  * @package chamilo.gradebook
  */
-/**
- * Init
- */
+
 $language_file = 'gradebook';
 require_once '../inc/global.inc.php';
 require_once 'lib/be.inc.php';
@@ -50,7 +48,7 @@ if ($form->validate()) {
 
     $parent_cat = Category :: load($values['hid_category_id']);
     $global_weight = $cat[0]->get_weight();
-    //$values['weight'] = $values['weight_mask']/$global_weight*$parent_cat[0]->get_weight();    
+    //$values['weight'] = $values['weight_mask']/$global_weight*$parent_cat[0]->get_weight();
     $values['weight'] = $values['weight_mask'];
 
 
@@ -88,25 +86,25 @@ if ($form->validate()) {
 $interbreadcrumb[] = array(
     'url' => Security::remove_XSS($_SESSION['gradebook_dest']) . '?selectcat=' . $select_cat,
     'name' => get_lang('Gradebook'
-        ));
+    ));
 $this_section = SECTION_COURSES;
 
 $htmlHeadXtra[] = '<script type="text/javascript">
 $(document).ready( function() {
 
     $("#hid_category_id").change(function(){
-        
+
        $("#hid_category_id option:selected").each(function () {
            var cat_id = $(this).val();
-            $.ajax({ 
-                url: "' . api_get_path(WEB_AJAX_PATH) . 'gradebook.ajax.php?a=get_gradebook_weight", 
+            $.ajax({
+                url: "' . api_get_path(WEB_AJAX_PATH) . 'gradebook.ajax.php?a=get_gradebook_weight",
                 data: "cat_id="+cat_id,
                 success: function(return_value) {
                     if (return_value != 0 ) {
-                        $("#max_weight").html(return_value);                                             
-                    }                    
-                },            
-            });    
+                        $("#max_weight").html(return_value);
+                    }
+                },
+            });
        });
     });
 });
diff --git a/main/gradebook/gradebook_add_link.php b/main/gradebook/gradebook_add_link.php
index ae31e4240f..9401b19fc1 100755
--- a/main/gradebook/gradebook_add_link.php
+++ b/main/gradebook/gradebook_add_link.php
@@ -4,11 +4,9 @@
  * Script
  * @package chamilo.gradebook
  */
-/**
- * Init
- */
+
 $language_file = array('gradebook', 'exercice');
-//$cidReset = true;
+
 require_once '../inc/global.inc.php';
 require_once 'lib/be.inc.php';
 require_once 'lib/gradebook_functions.inc.php';
diff --git a/main/gradebook/gradebook_add_link_select_course.php b/main/gradebook/gradebook_add_link_select_course.php
index bc096b41bf..bc578fde17 100755
--- a/main/gradebook/gradebook_add_link_select_course.php
+++ b/main/gradebook/gradebook_add_link_select_course.php
@@ -1,12 +1,9 @@
-<?php // $Id: $
+<?php
 /* For licensing terms, see /license.txt */
 /**
  * Script
  * @package chamilo.gradebook
  */
-/**
- * Init
- */
 
 $language_file = 'gradebook';
 //$cidReset = true;
@@ -28,18 +25,18 @@ $catcourse = Category :: load ($_GET['selectcat']);
 $form = new CatForm(CatForm :: TYPE_SELECT_COURSE, $catadd, 'add_cat_form', null, api_get_self().'?selectcat=' . Security::remove_XSS($_GET['selectcat']));
 
 if ($form->validate()) {
-	$values = $form->exportValues();
-	$cat = new Category();
-	$cat->set_course_code($values['select_course']);
-	$cat->set_name($values['name']);
-	header('location: gradebook_add_link.php?selectcat=' .Security::remove_XSS($_GET['selectcat']).'&course_code='.Security::remove_XSS($values['select_course']));
-	exit;
+    $values = $form->exportValues();
+    $cat = new Category();
+    $cat->set_course_code($values['select_course']);
+    $cat->set_name($values['name']);
+    header('location: gradebook_add_link.php?selectcat=' .Security::remove_XSS($_GET['selectcat']).'&course_code='.Security::remove_XSS($values['select_course']));
+    exit;
 }
 
 $interbreadcrumb[] = array (
-	'url' => Security::remove_XSS($_SESSION['gradebook_dest']).'?selectcat='.Security::remove_XSS($_GET['selectcat']),
-	'name' => get_lang('Gradebook'
-));
+    'url' => Security::remove_XSS($_SESSION['gradebook_dest']).'?selectcat='.Security::remove_XSS($_GET['selectcat']),
+    'name' => get_lang('Gradebook'
+    ));
 Display :: display_header(get_lang('NewCategory'));
 $form->display();
 Display :: display_footer();
diff --git a/main/gradebook/gradebook_add_result.php b/main/gradebook/gradebook_add_result.php
index e653d98ee5..788a9834a8 100755
--- a/main/gradebook/gradebook_add_result.php
+++ b/main/gradebook/gradebook_add_result.php
@@ -1,12 +1,11 @@
-<?php // $Id: $
+<?php
 /* For licensing terms, see /license.txt */
+
 /**
  * Script
  * @package chamilo.gradebook
  */
-/**
- * Init
- */
+
 $language_file = 'gradebook';
 //$cidReset = true;
 require_once '../inc/global.inc.php';
@@ -28,27 +27,27 @@ $category = !empty($_GET['selectcat']) ? $_GET['selectcat'] : "";
 $add_result_form = new EvalForm(EvalForm :: TYPE_RESULT_ADD, $evaluation[0], $resultadd, 'add_result_form', null, api_get_self() . '?selectcat=' . Security::remove_XSS($category) . '&selecteval=' . Security::remove_XSS($_GET['selecteval']));
 $table = $add_result_form->toHtml();
 if ($add_result_form->validate()) {
-	$values = $add_result_form->exportValues();
-	$nr_users = $values['nr_users'];
-	if ($nr_users == '0') {
-		header('Location: gradebook_view_result.php?addresultnostudents=&selecteval=' . Security::remove_XSS($_GET['selecteval']));
-		exit;
-	}
-	$scores = ($values['score']);
-	foreach ($scores as $row) {
-		$res = new Result();
-		$res->set_evaluation_id($values['evaluation_id']);
-		$res->set_user_id(key($scores));
-		//if no scores are given, don't set the score
-		if ((!empty ($row)) || ($row == '0')) $res->set_score($row);
-		$res->add();
-		next($scores);
-	}
-	header('Location: gradebook_view_result.php?addresult=&selecteval=' . Security::remove_XSS($_GET['selecteval']));
-	exit;
+    $values = $add_result_form->exportValues();
+    $nr_users = $values['nr_users'];
+    if ($nr_users == '0') {
+        header('Location: gradebook_view_result.php?addresultnostudents=&selecteval=' . Security::remove_XSS($_GET['selecteval']));
+        exit;
+    }
+    $scores = ($values['score']);
+    foreach ($scores as $row) {
+        $res = new Result();
+        $res->set_evaluation_id($values['evaluation_id']);
+        $res->set_user_id(key($scores));
+        //if no scores are given, don't set the score
+        if ((!empty ($row)) || ($row == '0')) $res->set_score($row);
+        $res->add();
+        next($scores);
+    }
+    header('Location: gradebook_view_result.php?addresult=&selecteval=' . Security::remove_XSS($_GET['selecteval']));
+    exit;
 }
 $interbreadcrumb[] = array ('url' => Security::remove_XSS($_SESSION['gradebook_dest']),'name' => get_lang('Gradebook'));
 Display :: display_header(get_lang('AddResult'));
-DisplayGradebook :: display_header_result ($evaluation[0], null, 0,0);      
+DisplayGradebook :: display_header_result ($evaluation[0], null, 0,0);
 echo $table;
-Display :: display_footer();
\ No newline at end of file
+Display :: display_footer();
diff --git a/main/gradebook/gradebook_add_user.php b/main/gradebook/gradebook_add_user.php
index 844682507b..13feab7cc3 100755
--- a/main/gradebook/gradebook_add_user.php
+++ b/main/gradebook/gradebook_add_user.php
@@ -1,13 +1,10 @@
-<?php //$Id: gradebook_add_user.php 21153 2009-06-01 01:51:43Z yannoo $
+<?php
 
 /* For licensing terms, see /license.txt */
 /**
  * Script
  * @package chamilo.gradebook
  */
-/**
- * Init
- */
 
 //Disabling code when course code is null (gradebook as a tab) see issue #2705
 exit;
diff --git a/main/gradebook/gradebook_display_certificate.php b/main/gradebook/gradebook_display_certificate.php
index c09a94b5fb..5fe8c26481 100755
--- a/main/gradebook/gradebook_display_certificate.php
+++ b/main/gradebook/gradebook_display_certificate.php
@@ -4,9 +4,6 @@
  * Script
  * @package chamilo.gradebook
  */
-/**
- * Init
- */
 
 $language_file = 'gradebook';
 
@@ -20,19 +17,19 @@ require_once 'lib/be.inc.php';
 require_once 'lib/gradebook_data_generator.class.php';
 
 //extra javascript functions for in html head:
-$htmlHeadXtra[] =
-"<script>
+$htmlHeadXtra[] ="<script>
 function confirmation() {
-	if (confirm(\" ".trim(get_lang('AreYouSureToDelete'))." ?\"))
-		{return true;}
-	else
-		{return false;}
+	if (confirm(\" " . trim(get_lang('AreYouSureToDelete')) . " ?\")) {
+	    return true;
+	} else {
+	    return false;
+	}
 }
 </script>";
 api_block_anonymous_users();
 
 if (!api_is_allowed_to_edit()) {
-	api_not_allowed(true);
+    api_not_allowed(true);
 }
 
 $cat_id = isset($_GET['cat_id']) ? (int)$_GET['cat_id'] : null;
@@ -182,25 +179,25 @@ if (count($certificate_list)==0) {
     foreach ($certificate_list as $index=>$value) {
         echo '<tr>
                 <td width="100%" class="actions">'.get_lang('Student').' : '.api_get_person_name($value['firstname'], $value['lastname']).' ('.$value['username'].')</td>';
-		echo '</tr>';
+        echo '</tr>';
         echo '<tr><td>
             <table class="data_table">';
 
-		$list_certificate = get_list_gradebook_certificates_by_user_id($value['user_id'], $cat_id);
-		foreach ($list_certificate as $value_certificate) {
-			echo '<tr>';
-			echo '<td width="50%">'.get_lang('Score').' : '.$value_certificate['score_certificate'].'</td>';
-			echo '<td width="30%">'.get_lang('Date').' : '.api_convert_and_format_date($value_certificate['created_at']).'</td>';
-			echo '<td width="20%">';
+        $list_certificate = get_list_gradebook_certificates_by_user_id($value['user_id'], $cat_id);
+        foreach ($list_certificate as $value_certificate) {
+            echo '<tr>';
+            echo '<td width="50%">'.get_lang('Score').' : '.$value_certificate['score_certificate'].'</td>';
+            echo '<td width="30%">'.get_lang('Date').' : '.api_convert_and_format_date($value_certificate['created_at']).'</td>';
+            echo '<td width="20%">';
             $url = api_get_path(WEB_PATH).'certificates/index.php?id='.$value_certificate['id'];
             $certificates = Display::url(get_lang('Certificate'), $url, array('target'=>'_blank', 'class' => 'btn'));
             echo $certificates;
-			echo '<a onclick="return confirmation();" href="gradebook_display_certificate.php?sec_token='.$token.'&cidReq='.$course_code.'&action=delete&cat_id='.$cat_id.'&certificate_id='.$value_certificate['id'].'">
+            echo '<a onclick="return confirmation();" href="gradebook_display_certificate.php?sec_token='.$token.'&cidReq='.$course_code.'&action=delete&cat_id='.$cat_id.'&certificate_id='.$value_certificate['id'].'">
                     '.Display::return_icon('delete.png',get_lang('Delete')).'
                   </a>';
-			echo '</td></tr>';
-		}
-		echo '</table>';
+            echo '</td></tr>';
+        }
+        echo '</table>';
         echo '</td></tr>';
     }
     echo '</table>';
diff --git a/main/gradebook/gradebook_edit_all.php b/main/gradebook/gradebook_edit_all.php
index 0be185a810..29e3d8899b 100755
--- a/main/gradebook/gradebook_edit_all.php
+++ b/main/gradebook/gradebook_edit_all.php
@@ -1,13 +1,11 @@
 <?php
 /* For licensing terms, see /license.txt */
+
 /**
  * Script
  * @package chamilo.gradebook
  * @author Julio Montoya - fixes in order to use gradebook models + some code cleaning
  */
-/**
- * Init
- */
 
 $language_file= 'gradebook';
 $cidReset= true;
@@ -30,29 +28,29 @@ require_once 'lib/fe/displaygradebook.php';
 api_block_anonymous_users();
 
 if (!api_is_allowed_to_edit()) {
-	header('Location: /index.php');
-	exit;
+    header('Location: /index.php');
+    exit;
 }
 
 $my_selectcat = isset($_GET['selectcat']) ? intval($_GET['selectcat']) : '';
 
 if (empty($my_selectcat)) {
-	api_not_allowed();
+    api_not_allowed();
 }
 
 // 	DISPLAY HEADERS AND MESSAGES
 if (!isset($_GET['exportpdf']) and !isset($_GET['export_certificate'])) {
-	if (isset ($_GET['studentoverview'])) {
-		$interbreadcrumb[]= array ('url' => Security::remove_XSS($_SESSION['gradebook_dest']).'?selectcat=' . $my_selectcat,'name' => get_lang('Gradebook'));
-		Display :: display_header(get_lang('FlatView'));
-	} elseif (isset ($_GET['search'])) {
-		$interbreadcrumb[]= array ('url' => Security::remove_XSS($_SESSION['gradebook_dest']).'?selectcat=' . $my_selectcat,'name' => get_lang('Gradebook'));
-		Display :: display_header(get_lang('SearchResults'));
-	} else {
-		$interbreadcrumb[] = array ('url' => Security::remove_XSS($_SESSION['gradebook_dest']).'?selectcat=1', 'name' => get_lang('Gradebook'));
-		$interbreadcrumb[] = array ('url' => '#','name' => get_lang('EditAllWeights'));
-		Display :: display_header('');
-	}
+    if (isset ($_GET['studentoverview'])) {
+        $interbreadcrumb[]= array ('url' => Security::remove_XSS($_SESSION['gradebook_dest']).'?selectcat=' . $my_selectcat,'name' => get_lang('Gradebook'));
+        Display :: display_header(get_lang('FlatView'));
+    } elseif (isset ($_GET['search'])) {
+        $interbreadcrumb[]= array ('url' => Security::remove_XSS($_SESSION['gradebook_dest']).'?selectcat=' . $my_selectcat,'name' => get_lang('Gradebook'));
+        Display :: display_header(get_lang('SearchResults'));
+    } else {
+        $interbreadcrumb[] = array ('url' => Security::remove_XSS($_SESSION['gradebook_dest']).'?selectcat=1', 'name' => get_lang('Gradebook'));
+        $interbreadcrumb[] = array ('url' => '#','name' => get_lang('EditAllWeights'));
+        Display :: display_header('');
+    }
 }
 
 $course_id			  =	get_course_id_by_link_id($my_selectcat);
@@ -74,15 +72,15 @@ $table_evaluated[LINK_SURVEY]             = array(TABLE_SURVEY, 'code', 'survey_
 
 $submitted = isset($_POST['submitted'])?$_POST['submitted']:'';
 if ($submitted==1) {
-	Display :: display_confirmation_message(get_lang('GradebookWeightUpdated')) . '<br /><br />';
-	if (isset($_POST['evaluation'])) {
-		require_once 'lib/be/evaluation.class.php';
-		$eval_log = new Evaluation();
-	}
-	if(isset($_POST['link'])){
-		require_once 'lib/be/abstractlink.class.php';
-		//$eval_link_log = new AbstractLink();
-	}
+    Display :: display_confirmation_message(get_lang('GradebookWeightUpdated')) . '<br /><br />';
+    if (isset($_POST['evaluation'])) {
+        require_once 'lib/be/evaluation.class.php';
+        $eval_log = new Evaluation();
+    }
+    if(isset($_POST['link'])){
+        require_once 'lib/be/abstractlink.class.php';
+        //$eval_link_log = new AbstractLink();
+    }
 }
 
 $output='';
@@ -168,30 +166,30 @@ while ($row = Database ::fetch_array($sql)) {
 //by iflorespaz
 $my_api_cidreq = api_get_cidreq();
 if ($my_api_cidreq=='') {
-	$my_api_cidreq='cidReq='.$my_category['course_code'];
+    $my_api_cidreq='cidReq='.$my_category['course_code'];
 }
 ?>
-<div class="actions">
-<a href="<?php echo Security::remove_XSS($_SESSION['gradebook_dest']).'?id_session='.api_get_session_id().'&amp;'.$my_api_cidreq ?>&selectcat=<?php echo $my_selectcat ?>">
-    <?php echo Display::return_icon('back.png',get_lang('FolderView'),'',ICON_SIZE_MEDIUM); ?>
-</a>
-</div>
+    <div class="actions">
+        <a href="<?php echo Security::remove_XSS($_SESSION['gradebook_dest']).'?id_session='.api_get_session_id().'&amp;'.$my_api_cidreq ?>&selectcat=<?php echo $my_selectcat ?>">
+            <?php echo Display::return_icon('back.png',get_lang('FolderView'),'',ICON_SIZE_MEDIUM); ?>
+        </a>
+    </div>
 <?php
 $warning_message = sprintf(get_lang('TotalWeightMustBeX'), $masked_total);
 Display::display_normal_message($warning_message, false);
 ?>
-<form method="post" action="gradebook_edit_all.php?id_session=<?php echo $_SESSION['id_session'].'&amp;'.$my_api_cidreq ?>&selectcat=<?php echo $my_selectcat?>">
-<table class="data_table">
-    <tr class="row_odd">
-        <th style="width: 35px;"><?php echo get_lang('Type'); ?></th>
-        <th><?php echo get_lang('Resource'); ?></th>
-        <th><?php echo get_lang('Weight'); ?></th>
-    </tr>
-    <?php echo $output; ?>
- </table>
- <input type="hidden" name="submitted" value="1" />
- <br />
- <button class="save" type="submit" name="name" value="<?php echo get_lang('Save') ?>"><?php echo get_lang('SaveScoringRules') ?></button>
-</form>
+    <form method="post" action="gradebook_edit_all.php?id_session=<?php echo $_SESSION['id_session'].'&amp;'.$my_api_cidreq ?>&selectcat=<?php echo $my_selectcat?>">
+        <table class="data_table">
+            <tr class="row_odd">
+                <th style="width: 35px;"><?php echo get_lang('Type'); ?></th>
+                <th><?php echo get_lang('Resource'); ?></th>
+                <th><?php echo get_lang('Weight'); ?></th>
+            </tr>
+            <?php echo $output; ?>
+        </table>
+        <input type="hidden" name="submitted" value="1" />
+        <br />
+        <button class="save" type="submit" name="name" value="<?php echo get_lang('Save') ?>"><?php echo get_lang('SaveScoringRules') ?></button>
+    </form>
 <?php
 Display :: display_footer();
diff --git a/main/gradebook/gradebook_edit_cat.php b/main/gradebook/gradebook_edit_cat.php
index 84543bd0fb..ac92a2114a 100755
--- a/main/gradebook/gradebook_edit_cat.php
+++ b/main/gradebook/gradebook_edit_cat.php
@@ -1,12 +1,11 @@
 <?php
 /* For licensing terms, see /license.txt */
+
 /**
  * Script
  * @package chamilo.gradebook
  */
-/**
- * Init
- */
+
 $language_file = 'gradebook';
 
 require_once '../inc/global.inc.php';
@@ -80,13 +79,11 @@ function check_skills() {
 }
 </script>';
 
-
 $catedit = Category::load($edit_cat);
-
 $form = new CatForm(CatForm::TYPE_EDIT, $catedit[0], 'edit_cat_form');
 
 if ($form->validate()) {
-	$values = $form->getSubmitValues();
+    $values = $form->getSubmitValues();
 
     $cat = new Category();
 
@@ -97,36 +94,36 @@ if ($form->validate()) {
         }
     }
 
-	$cat->set_id($values['hid_id']);
-	$cat->set_name($values['name']);
+    $cat->set_id($values['hid_id']);
+    $cat->set_name($values['name']);
 
-	if (empty ($values['course_code'])) {
-		$cat->set_course_code(null);
-	}else {
-		$cat->set_course_code($values['course_code']);
-	}
+    if (empty ($values['course_code'])) {
+        $cat->set_course_code(null);
+    }else {
+        $cat->set_course_code($values['course_code']);
+    }
 
     $cat->set_grade_model_id($values['grade_model_id']);
-	$cat->set_description($values['description']);
-	$cat->set_skills($values['skills']);
-	$cat->set_user_id($values['hid_user_id']);
-	$cat->set_parent_id($values['hid_parent_id']);
-	$cat->set_weight($values['weight']);
-
-	if ($values['hid_parent_id'] == 0 ) {
-		$cat->set_certificate_min_score($values['certif_min_score']);
-	}
+    $cat->set_description($values['description']);
+    $cat->set_skills($values['skills']);
+    $cat->set_user_id($values['hid_user_id']);
+    $cat->set_parent_id($values['hid_parent_id']);
+    $cat->set_weight($values['weight']);
+
+    if ($values['hid_parent_id'] == 0 ) {
+        $cat->set_certificate_min_score($values['certif_min_score']);
+    }
 
     if (empty ($values['visible'])) {
-		$visible = 0;
-	} else {
-		$visible = 1;
-	}
+        $visible = 0;
+    } else {
+        $visible = 1;
+    }
 
     $cat->set_visible($visible);
-	$cat->save();
-	header('Location: '.Security::remove_XSS($_SESSION['gradebook_dest']).'?editcat=&selectcat=' . $cat->get_parent_id());
-	exit;
+    $cat->save();
+    header('Location: '.Security::remove_XSS($_SESSION['gradebook_dest']).'?editcat=&selectcat=' . $cat->get_parent_id());
+    exit;
 }
 $selectcat = isset($_GET['selectcat']) ? Security::remove_XSS($_GET['selectcat']) : '';
 $interbreadcrumb[] = array ('url' => Security::remove_XSS($_SESSION['gradebook_dest']).'?selectcat='.$selectcat,'name' => get_lang('Gradebook'));
diff --git a/main/gradebook/gradebook_edit_eval.php b/main/gradebook/gradebook_edit_eval.php
index 62e466938a..f269baf91f 100755
--- a/main/gradebook/gradebook_edit_eval.php
+++ b/main/gradebook/gradebook_edit_eval.php
@@ -1,12 +1,11 @@
-<?php // $Id: $
+<?php
 /* For licensing terms, see /license.txt */
+
 /**
  * Script
  * @package chamilo.gradebook
  */
-/**
- * Init
- */
+
 $language_file = 'gradebook';
 //$cidReset = true;
 require_once '../inc/global.inc.php';
@@ -20,64 +19,69 @@ $evaledit = Evaluation :: load($_GET['editeval']);
 if ($evaledit[0]->is_locked() && !api_is_platform_admin()) {
     api_not_allowed();
 }
-$form = new EvalForm(EvalForm :: TYPE_EDIT, $evaledit[0], null, 'edit_eval_form',null,api_get_self() . '?editeval=' . Security::remove_XSS($_GET['editeval']));
+$form = new EvalForm(
+    EvalForm :: TYPE_EDIT,
+    $evaledit[0],
+    null,
+    'edit_eval_form',
+    null,
+    api_get_self() . '?editeval=' . Security::remove_XSS($_GET['editeval'])
+);
 if ($form->validate()) {
-	$values = $form->exportValues();
-	$eval = new Evaluation();
-	$eval->set_id($values['hid_id']);
-	$eval->set_name($values['name']);
-	$eval->set_description($values['description']);
-	$eval->set_user_id($values['hid_user_id']);
-	$eval->set_course_code($values['hid_course_code']);
-	$eval->set_category_id($values['hid_category_id']);
-        
-    $parent_cat = Category :: load($values['hid_category_id']);                
-    
+    $values = $form->exportValues();
+    $eval = new Evaluation();
+    $eval->set_id($values['hid_id']);
+    $eval->set_name($values['name']);
+    $eval->set_description($values['description']);
+    $eval->set_user_id($values['hid_user_id']);
+    $eval->set_course_code($values['hid_course_code']);
+    $eval->set_category_id($values['hid_category_id']);
+
+    $parent_cat = Category :: load($values['hid_category_id']);
+
     /*$final_weight = null;
     if ($parent_cat[0]->get_parent_id() == 0) {
-        $final_weight = $values['weight_mask'];    
+        $final_weight = $values['weight_mask'];
     } else {
         $cat = Category :: load($parent_cat[0]->get_parent_id());
         $global_weight = $cat[0]->get_weight();
-        $final_weight = $values['weight_mask']/$global_weight*$parent_cat[0]->get_weight();        
-    }*/   
+        $final_weight = $values['weight_mask']/$global_weight*$parent_cat[0]->get_weight();
+    }*/
     $final_weight = $values['weight_mask'];
-    
+
     $eval->set_weight($final_weight);
-    
-	$eval->set_max($values['max']);
-	if (empty ($values['visible'])) {
-		$visible = 0;
-	} else {
-		$visible = 1;
-	}
-	$eval->set_visible($visible);
-	$eval->save();
-	header('Location: '.$_SESSION['gradebook_dest'].'?editeval=&selectcat=' . $eval->get_category_id());
-	exit;
+
+    $eval->set_max($values['max']);
+    if (empty ($values['visible'])) {
+        $visible = 0;
+    } else {
+        $visible = 1;
+    }
+    $eval->set_visible($visible);
+    $eval->save();
+    header('Location: '.$_SESSION['gradebook_dest'].'?editeval=&selectcat=' . $eval->get_category_id());
+    exit;
 }
 $selectcat_inter=isset($_GET['selectcat'])?Security::remove_XSS($_GET['selectcat']):'';
 $interbreadcrumb[] = array (
-	'url' => $_SESSION['gradebook_dest'].'?selectcat='.$selectcat_inter,
-	'name' => get_lang('Gradebook'
-));
+    'url' => $_SESSION['gradebook_dest'].'?selectcat='.$selectcat_inter,
+    'name' => get_lang('Gradebook'
+    ));
 
 $htmlHeadXtra[] = '<script type="text/javascript">
 $(document).ready( function() {
-
-    $("#hid_category_id").change(function(){
-        
+    $("#hid_category_id").change(function() {
        $("#hid_category_id option:selected").each(function () {
            var cat_id = $(this).val();
-            $.ajax({ 
-                url: "'.api_get_path(WEB_AJAX_PATH).'gradebook.ajax.php?a=get_gradebook_weight", 
+            $.ajax({
+                url: "'.api_get_path(WEB_AJAX_PATH).'gradebook.ajax.php?a=get_gradebook_weight",
                 data: "cat_id="+cat_id,
                 success: function(return_value) {
                     if (return_value != 0 ) {
-                        $("#max_weight").html(return_value);                                             
-                    }                    
-                },            
-            });    
+                        $("#max_weight").html(return_value);
+                    }
+                }
+            });
        });
     });
 });
diff --git a/main/gradebook/gradebook_edit_link.php b/main/gradebook/gradebook_edit_link.php
index 721ed6a9c7..3385964b70 100755
--- a/main/gradebook/gradebook_edit_link.php
+++ b/main/gradebook/gradebook_edit_link.php
@@ -1,12 +1,11 @@
 <?php
 /* For licensing terms, see /license.txt */
+
 /**
  * Script
  * @package chamilo.gradebook
  */
-/**
- * Init
- */
+
 $language_file = array('gradebook', 'exercice', 'link');
 //$cidReset = true;
 require_once '../inc/global.inc.php';
@@ -42,7 +41,7 @@ if ($session_id == 0) {
 
 $form = new LinkAddEditForm(LinkAddEditForm :: TYPE_EDIT, $cats, null, $link, 'edit_link_form', api_get_self() . '?selectcat=' . $linkcat. '&editlink=' . $linkedit);
 if ($form->validate()) {
-	$values = $form->exportValues();
+    $values = $form->exportValues();
     $parent_cat = Category :: load($values['select_gradebook']);
 
     $final_weight = null;
@@ -57,44 +56,43 @@ if ($form->validate()) {
 
     $final_weight = $values['weight_mask'];
 
-	$link->set_weight($final_weight);
+    $link->set_weight($final_weight);
 
     if (!empty($values['select_gradebook'])) {
         $link->set_category_id($values['select_gradebook']);
     }
-	$link->set_visible(empty ($values['visible']) ? 0 : 1);
-	$link->save();
-
-	//Update weight for attendance
-	$sql = 'SELECT ref_id FROM '.$tbl_grade_links.' WHERE id = '.intval($_GET['editlink']).' AND type='.LINK_ATTENDANCE;
-	$rs_attendance  = Database::query($sql);
-	if (Database::num_rows($rs_attendance) > 0) {
-		$row_attendance = Database::fetch_array($rs_attendance);
-		$attendance_id  = $row_attendance['ref_id'];
-		$upd_attendance = 'UPDATE '.$tbl_attendance.' SET attendance_weight ='.floatval($final_weight).' WHERE c_id = '.$course_id.' AND  id = '.intval($attendance_id);
-		Database::query($upd_attendance);
-	}
-
-	//Update weight into forum thread
-	$sql_t = 'UPDATE '.$tbl_forum_thread.' SET thread_weight='.$final_weight.'
+    $link->set_visible(empty ($values['visible']) ? 0 : 1);
+    $link->save();
+
+    //Update weight for attendance
+    $sql = 'SELECT ref_id FROM '.$tbl_grade_links.' WHERE id = '.intval($_GET['editlink']).' AND type='.LINK_ATTENDANCE;
+    $rs_attendance  = Database::query($sql);
+    if (Database::num_rows($rs_attendance) > 0) {
+        $row_attendance = Database::fetch_array($rs_attendance);
+        $attendance_id  = $row_attendance['ref_id'];
+        $upd_attendance = 'UPDATE '.$tbl_attendance.' SET attendance_weight ='.floatval($final_weight).' WHERE c_id = '.$course_id.' AND  id = '.intval($attendance_id);
+        Database::query($upd_attendance);
+    }
+
+    //Update weight into forum thread
+    $sql_t = 'UPDATE '.$tbl_forum_thread.' SET thread_weight='.$final_weight.'
 			  WHERE c_id = '.$course_id.' AND thread_id=(SELECT ref_id FROM '.$tbl_grade_links.' WHERE id='.intval($_GET['editlink']).' and type=5) ';
 
-	Database::query($sql_t);
+    Database::query($sql_t);
 
-	//Update weight into student publication(work)
-	$sql_t = 'UPDATE '.$tbl_work.' SET weight='.$final_weight.'
+    //Update weight into student publication(work)
+    $sql_t = 'UPDATE '.$tbl_work.' SET weight='.$final_weight.'
 			  WHERE c_id = '.$course_id.' AND id = (SELECT ref_id FROM '.$tbl_grade_links.' WHERE id='.intval($_GET['editlink'] ).' AND type=3 )';
 
-	Database::query($sql_t);
-	header('Location: '.$_SESSION['gradebook_dest'].'?linkedited=&selectcat=' . $link->get_category_id());
-	exit;
+    Database::query($sql_t);
+    header('Location: '.$_SESSION['gradebook_dest'].'?linkedited=&selectcat=' . $link->get_category_id());
+    exit;
 }
 
 $interbreadcrumb[] = array ('url' => Security::remove_XSS($_SESSION['gradebook_dest']).'?selectcat='.$linkcat,'name' => get_lang('Gradebook'));
 $htmlHeadXtra[] = '<script type="text/javascript">
 $(document).ready( function() {
-
-    $("#hide_category_id").change(function(){
+    $("#hide_category_id").change(function() {
        $("#hide_category_id option:selected").each(function () {
            var cat_id = $(this).val();
             $.ajax({
@@ -104,7 +102,7 @@ $(document).ready( function() {
                     if (return_value != 0 ) {
                         $("#max_weight").html(return_value);
                     }
-                },
+                }
             });
        });
     });
diff --git a/main/gradebook/gradebook_edit_result.php b/main/gradebook/gradebook_edit_result.php
index c19cb4b9d9..c20812b360 100755
--- a/main/gradebook/gradebook_edit_result.php
+++ b/main/gradebook/gradebook_edit_result.php
@@ -1,12 +1,10 @@
-<?php // $Id: $
+<?php
 /* For licensing terms, see /license.txt */
 /**
  * Script
  * @package chamilo.gradebook
  */
-/**
- * Init
- */
+
 $language_file = 'gradebook';
 //$cidReset = true;
 require_once '../inc/global.inc.php';
@@ -19,7 +17,7 @@ api_block_anonymous_users();
 block_students();
 $select_eval=Security::remove_XSS($_GET['selecteval']);
 if (empty($select_eval)) {
-	api_not_allowed();
+    api_not_allowed();
 }
 $resultedit = Result :: load (null,null,$select_eval);
 $evaluation = Evaluation :: load ($select_eval);
@@ -29,29 +27,29 @@ $evaluation[0]->check_lock_permissions();
 $edit_result_form = new EvalForm(EvalForm :: TYPE_ALL_RESULTS_EDIT, $evaluation[0], $resultedit, 'edit_result_form', null, api_get_self() . '?&selecteval='.$select_eval);
 $table = $edit_result_form->toHtml();
 if ($edit_result_form->validate()) {
-	$values = $edit_result_form->exportValues();
-	$scores = ($values['score']);
-	foreach ($scores as $row) {
-		$resultedit = Result :: load (key($scores));
-		$row_value = $row;
-		if ($row_value != '' ) {            
-			$resultedit[0]->set_score(floatval(number_format($row_value, api_get_setting('gradebook_number_decimals'))));
+    $values = $edit_result_form->exportValues();
+    $scores = ($values['score']);
+    foreach ($scores as $row) {
+        $resultedit = Result :: load (key($scores));
+        $row_value = $row;
+        if ($row_value != '' ) {
+            $resultedit[0]->set_score(floatval(number_format($row_value, api_get_setting('gradebook_number_decimals'))));
             $resultedit[0]->save();
-		}		
-		next($scores);
-	}
-	header('Location: gradebook_view_result.php?selecteval='.$select_eval.'&editallresults=');
-	exit;
+        }
+        next($scores);
+    }
+    header('Location: gradebook_view_result.php?selecteval='.$select_eval.'&editallresults=');
+    exit;
 }
 
 $interbreadcrumb[] = array (
-	'url' => $_SESSION['gradebook_dest'],
-	'name' => get_lang('Gradebook'
-));
+    'url' => $_SESSION['gradebook_dest'],
+    'name' => get_lang('Gradebook'
+    ));
 $interbreadcrumb[]= array (
-	'url' => 'gradebook_view_result.php?selecteval='.$select_eval,
-	'name' => get_lang('ViewResult'
-));
+    'url' => 'gradebook_view_result.php?selecteval='.$select_eval,
+    'name' => get_lang('ViewResult'
+    ));
 Display :: display_header(get_lang('EditResult'));
 DisplayGradebook :: display_header_result ($evaluation[0],null,0,0);
 echo $table;
diff --git a/main/gradebook/gradebook_flatview.php b/main/gradebook/gradebook_flatview.php
index e0dfb17ceb..cc4038b3d9 100755
--- a/main/gradebook/gradebook_flatview.php
+++ b/main/gradebook/gradebook_flatview.php
@@ -1,5 +1,6 @@
 <?php
 /* For licensing terms, see /license.txt */
+
 /**
  * Script
  * @package chamilo.gradebook
@@ -26,8 +27,8 @@ api_block_anonymous_users();
 block_students();
 
 if (isset ($_POST['submit']) && isset ($_POST['keyword'])) {
-	header('Location: '.api_get_self().'?selectcat='.Security::remove_XSS($_GET['selectcat']).'&search='.Security::remove_XSS($_POST['keyword']));
-	exit;
+    header('Location: '.api_get_self().'?selectcat='.Security::remove_XSS($_GET['selectcat']).'&search='.Security::remove_XSS($_POST['keyword']));
+    exit;
 }
 
 $interbreadcrumb[] = array ('url' => $_SESSION['gradebook_dest'].'?selectcat=1', 'name' => get_lang('ToolGradebook'));
@@ -35,38 +36,38 @@ $interbreadcrumb[] = array ('url' => $_SESSION['gradebook_dest'].'?selectcat=1',
 $showeval = isset($_POST['showeval']) ? '1' : '0';
 $showlink = isset($_POST['showlink']) ? '1' : '0';
 if (($showlink == '0') && ($showeval == '0')) {
-	$showlink = '1';
-	$showeval = '1';
+    $showlink = '1';
+    $showeval = '1';
 }
 
 $cat = Category::load($_REQUEST['selectcat']);
 
 if (isset($_GET['userid'])) {
-	$userid = Security::remove_XSS($_GET['userid']);
+    $userid = Security::remove_XSS($_GET['userid']);
 } else {
-	$userid = '';
+    $userid = '';
 }
 
 if ($showeval) {
-	$alleval = $cat[0]->get_evaluations($userid, true);
+    $alleval = $cat[0]->get_evaluations($userid, true);
 } else {
-	$alleval = null;
+    $alleval = null;
 }
 
 if ($showlink) {
-	$alllinks = $cat[0]->get_links($userid, true);
+    $alllinks = $cat[0]->get_links($userid, true);
 } else {
-	$alllinks = null;
+    $alllinks = null;
 }
 
 if (isset($export_flatview_form) && (!$file_type == 'pdf')) {
-	Display :: display_normal_message($export_flatview_form->toHtml(), false);
+    Display :: display_normal_message($export_flatview_form->toHtml(), false);
 }
 
 if (isset($_GET['selectcat'])) {
-	$category_id = Security::remove_XSS($_GET['selectcat']);
+    $category_id = Security::remove_XSS($_GET['selectcat']);
 } else {
-	$category_id = '';
+    $category_id = '';
 }
 
 $simple_search_form = new UserForm(
@@ -80,21 +81,21 @@ $values = $simple_search_form->exportValues();
 
 $keyword = '';
 if (isset($_GET['search']) && !empty($_GET['search'])) {
-	$keyword = Security::remove_XSS($_GET['search']);
+    $keyword = Security::remove_XSS($_GET['search']);
 }
 if ($simple_search_form->validate() && (empty($keyword))) {
-	$keyword = $values['keyword'];
+    $keyword = $values['keyword'];
 }
 
 if (!empty($keyword)) {
-	$users = find_students($keyword);
+    $users = find_students($keyword);
 
 } else {
-	if (isset($alleval) && isset($alllinks)) {
-		$users = get_all_users($alleval, $alllinks);
-	} else {
-		$users = null;
-	}
+    if (isset($alleval) && isset($alllinks)) {
+        $users = get_all_users($alleval, $alllinks);
+    } else {
+        $users = null;
+    }
 }
 
 $offset = isset($_GET['offset']) ? $_GET['offset'] : '0';
@@ -129,10 +130,10 @@ if (isset($_GET['export_pdf']) && $_GET['export_pdf'] == 'category') {
 }
 
 if (isset($_GET['exportpdf']))	{
-	$interbreadcrumb[] = array (
-		'url' => api_get_self().'?selectcat=' . Security::remove_XSS($_GET['selectcat']),
-		'name' => get_lang('FlatView')
-	);
+    $interbreadcrumb[] = array (
+        'url' => api_get_self().'?selectcat=' . Security::remove_XSS($_GET['selectcat']),
+        'name' => get_lang('FlatView')
+    );
 
     $export_pdf_form = new DataForm(
         DataForm::TYPE_EXPORT_PDF,
@@ -143,18 +144,18 @@ if (isset($_GET['exportpdf']))	{
         ''
     );
 
-	if ($export_pdf_form->validate()) {
+    if ($export_pdf_form->validate()) {
         $params = $export_pdf_form->exportValues();
         Display :: set_header(null, false, false);
         $params['join_firstname_lastname'] = true;
         $params['show_official_code'] = true;
         $params['export_pdf'] = true;
         $params['only_total_category'] = false;
-		export_pdf_flatview($flatviewtable, $cat, $users, $alleval, $alllinks, $params, $mainCourseCategory[0]);
+        export_pdf_flatview($flatviewtable, $cat, $users, $alleval, $alllinks, $params, $mainCourseCategory[0]);
 
-	} else {
-		Display :: display_header(get_lang('ExportPDF'));
-	}
+    } else {
+        Display :: display_header(get_lang('ExportPDF'));
+    }
 }
 
 if (isset($_GET['print']))	{
@@ -166,13 +167,13 @@ if (isset($_GET['print']))	{
         $params,
         $mainCourseCategory[0]
     );
-	echo print_table(
+    echo print_table(
         $printable_data[1],
         $printable_data[0],
         get_lang('FlatView'),
         $cat[0]->get_name()
     );
-	exit;
+    exit;
 }
 
 if (!empty($_GET['export_report']) && $_GET['export_report'] == 'export_report') {
diff --git a/main/gradebook/gradebook_result.class.php b/main/gradebook/gradebook_result.class.php
index a8735a9622..29a4baba40 100755
--- a/main/gradebook/gradebook_result.class.php
+++ b/main/gradebook/gradebook_result.class.php
@@ -1,284 +1,283 @@
 <?php
 /* For licensing terms, see /license.txt */
-/**
-*	ExerciseResult class: This class allows to instantiate an object of type ExerciseResult
-*	which allows you to export exercises results in multiple presentation forms
-*	@package chamilo.gradebook
-* 	@author Yannick Warnier
-*/
-
 
-if(!class_exists('GradeBookResult')):
 /**
  * Gradebook results class
+ * @author Yannick Warnier
  * @package chamilo.gradebook
  */
 class GradeBookResult
 {
-	private $gradebook_list = array(); //stores the list of exercises
-	private $results = array(); //stores the results
+    private $gradebook_list = array(); //stores the list of exercises
+    private $results = array(); //stores the results
 
-	/**
-	 * constructor of the class
-	 */
-	public function GradeBookResult($get_questions=false,$get_answers=false) {
-		//nothing to do
-		/*
-		$this->exercise_list = array();
-		$this->readExercisesList();
-		if($get_questions)
-		{
-			foreach($this->exercises_list as $exe)
-			{
-				$this->exercises_list['questions'] = $this->getExerciseQuestionList($exe['id']);
-			}
-		}
-		*/
-	}
+    /**
+     * constructor of the class
+     */
+    public function GradeBookResult($get_questions=false,$get_answers=false)
+    {
+        //nothing to do
+        /*
+        $this->exercise_list = array();
+        $this->readExercisesList();
+        if($get_questions)
+        {
+            foreach($this->exercises_list as $exe)
+            {
+                $this->exercises_list['questions'] = $this->getExerciseQuestionList($exe['id']);
+            }
+        }
+        */
+    }
 
-	/**
-	 * Reads exercises information (minimal) from the data base
-	 * @param	boolean		Whether to get only visible exercises (true) or all of them (false). Defaults to false.
-	 * @return	array		A list of exercises available
-	 */
-	private function _readGradebookList($only_visible = false) {
-		$return = array();
-    	$TBL_EXERCISES          = Database::get_course_table(TABLE_QUIZ_TEST);
+    /**
+     * Reads exercises information (minimal) from the data base
+     * @param	boolean		Whether to get only visible exercises (true) or all of them (false). Defaults to false.
+     * @return	array		A list of exercises available
+     */
+    private function _readGradebookList($only_visible = false) {
+        $return = array();
+        $TBL_EXERCISES          = Database::get_course_table(TABLE_QUIZ_TEST);
 
-		$sql="SELECT id,title,type,random,active FROM $TBL_EXERCISES";
-		if($only_visible) {
-			$sql.= ' WHERE active=1';
-		}
-		$sql .= ' ORDER BY title';
-		$result=Database::query($sql);
+        $sql="SELECT id,title,type,random,active FROM $TBL_EXERCISES";
+        if($only_visible) {
+            $sql.= ' WHERE active=1';
+        }
+        $sql .= ' ORDER BY title';
+        $result=Database::query($sql);
 
-		// if the exercise has been found
-		while($row=Database::fetch_array($result,'ASSOC')) {
-			$return[] = $row;
-		}
-		// exercise not found
-		return $return;
-	}
+        // if the exercise has been found
+        while($row=Database::fetch_array($result,'ASSOC')) {
+            $return[] = $row;
+        }
+        // exercise not found
+        return $return;
+    }
 
-	/**
-	 * Gets the questions related to one exercise
-	 * @param	integer		Exercise ID
-	 */
-	private function _readGradeBookQuestionsList($e_id) {
-		$return = array();
-    	$TBL_EXERCISE_QUESTION  = Database::get_course_table(TABLE_QUIZ_TEST_QUESTION);
-    	$TBL_QUESTIONS = Database::get_course_table(TABLE_QUIZ_QUESTION);
-    	$course_id = api_get_course_int_id();
-		$sql="SELECT q.id, q.question, q.ponderation, q.position, q.type, q.picture " .
-			" FROM $TBL_EXERCISE_QUESTION eq, $TBL_QUESTIONS q " .
-			" WHERE eq.c_di = $course_id AND
-					q.c_di = $course_id AND					
-					eq.question_id=q.id AND 
+    /**
+     * Gets the questions related to one exercise
+     * @param	integer		Exercise ID
+     */
+    private function _readGradeBookQuestionsList($e_id) {
+        $return = array();
+        $TBL_EXERCISE_QUESTION  = Database::get_course_table(TABLE_QUIZ_TEST_QUESTION);
+        $TBL_QUESTIONS = Database::get_course_table(TABLE_QUIZ_QUESTION);
+        $course_id = api_get_course_int_id();
+        $sql="SELECT q.id, q.question, q.ponderation, q.position, q.type, q.picture " .
+            " FROM $TBL_EXERCISE_QUESTION eq, $TBL_QUESTIONS q " .
+            " WHERE eq.c_di = $course_id AND
+					q.c_di = $course_id AND
+					eq.question_id=q.id AND
 					eq.exercice_id='$e_id' " .
-			" ORDER BY q.position";
-		$result = Database::query($sql);
+            " ORDER BY q.position";
+        $result = Database::query($sql);
+
+        // fills the array with the question ID for this exercise
+        // the key of the array is the question position
+        while($row=Database::fetch_array($result,'ASSOC')) {
+            $return[] = $row;
+        }
+        return true;
+    }
+    /**
+     * Gets the results of all students (or just one student if access is limited)
+     * @param	string		The document path (for HotPotatoes retrieval)
+     * @param	integer		User ID. Optional. If no user ID is provided, we take all the results. Defauts to null
+     */
+    function _getGradeBookReporting($document_path,$user_id=null) {
+        $return = array();
+        $TBL_EXERCISES          = Database::get_course_table(TABLE_QUIZ_TEST);
+        $TBL_USER          	    = Database::get_main_table(TABLE_MAIN_USER);
+        $TBL_TRACK_EXERCISES	= Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_EXERCICES);
+        $TBL_TRACK_HOTPOTATOES	= Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_HOTPOTATOES);
 
-		// fills the array with the question ID for this exercise
-		// the key of the array is the question position
-		while($row=Database::fetch_array($result,'ASSOC')) {
-			$return[] = $row;
-		}
-		return true;
-	}
-	/**
-	 * Gets the results of all students (or just one student if access is limited)
-	 * @param	string		The document path (for HotPotatoes retrieval)
-	 * @param	integer		User ID. Optional. If no user ID is provided, we take all the results. Defauts to null
-	 */
-	function _getGradeBookReporting($document_path,$user_id=null) {
-		$return = array();
-    	$TBL_EXERCISES          = Database::get_course_table(TABLE_QUIZ_TEST);
-    	$TBL_USER          	    = Database::get_main_table(TABLE_MAIN_USER);		
-		$TBL_TRACK_EXERCISES	= Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_EXERCICES);
-		$TBL_TRACK_HOTPOTATOES	= Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_HOTPOTATOES);
-		
-    	$cid = api_get_course_id();
-    	$course_id = api_get_course_int_id();
-		if (empty($user_id)) {
-			//get all results (ourself and the others) as an admin should see them
-			//AND exe_user_id <> $_user['user_id']  clause has been removed
-			$sql="SELECT ".(api_is_western_name_order() ? "CONCAT(firstname,' ',lastname)" : "CONCAT(lastname,' ',firstname)").", ce.title, te.exe_result ,
+        $cid = api_get_course_id();
+        $course_id = api_get_course_int_id();
+        if (empty($user_id)) {
+            //get all results (ourself and the others) as an admin should see them
+            //AND exe_user_id <> $_user['user_id']  clause has been removed
+            $sql="SELECT ".(api_is_western_name_order() ? "CONCAT(firstname,' ',lastname)" : "CONCAT(lastname,' ',firstname)").", ce.title, te.exe_result ,
 						te.exe_weighting, te.exe_date,te.exe_id, user.email, user.user_id
 				  FROM $TBL_EXERCISES ce , $TBL_TRACK_EXERCISES te, $TBL_USER user
 				  WHERE ce.c_id = $course_id AND
-				  		te.exe_exo_id = ce.id AND 
+				  		te.exe_exo_id = ce.id AND
 				  		user_id=te.exe_user_id AND te.exe_cours_id='$cid'
 				  ORDER BY te.exe_cours_id ASC, ce.title ASC, te.exe_date ASC";
 
-			$hpsql="SELECT ".(api_is_western_name_order() ? "CONCAT(tu.firstname,' ',tu.lastname)" : "CONCAT(tu.lastname,' ',tu.firstname)").", tth.exe_name,
+            $hpsql="SELECT ".(api_is_western_name_order() ? "CONCAT(tu.firstname,' ',tu.lastname)" : "CONCAT(tu.lastname,' ',tu.firstname)").", tth.exe_name,
 						tth.exe_result , tth.exe_weighting, tth.exe_date, tu.email, tu.user_id
 					FROM $TBL_TRACK_HOTPOTATOES tth, $TBL_USER tu
 					WHERE  tu.user_id=tth.exe_user_id AND tth.exe_cours_id = '".$cid."'
 					ORDER BY tth.exe_cours_id ASC, tth.exe_date ASC";
 
-		} else { // get only this user's results
-			  $sql = "SELECT '',ce.title, te.exe_result , te.exe_weighting, te.exe_date,te.exe_id
+        } else { // get only this user's results
+            $sql = "SELECT '',ce.title, te.exe_result , te.exe_weighting, te.exe_date,te.exe_id
 						FROM $TBL_EXERCISES ce , $TBL_TRACK_EXERCISES te
 				  		WHERE 	ce.c_id 		= $course_id AND
-				  				te.exe_exo_id 	= ce.id AND 
-				  				te.exe_user_id 	= '".$user_id."' AND 
+				  				te.exe_exo_id 	= ce.id AND
+				  				te.exe_user_id 	= '".$user_id."' AND
 				  				te.exe_cours_id = '$cid'
 				  		ORDER BY te.exe_cours_id ASC, ce.title ASC, te.exe_date ASC";
 
-			$hpsql="SELECT '',exe_name, exe_result , exe_weighting, exe_date
+            $hpsql="SELECT '',exe_name, exe_result , exe_weighting, exe_date
 					FROM $TBL_TRACK_HOTPOTATOES
 					WHERE exe_user_id = '".$user_id."' AND exe_cours_id = '".$cid."'
 					ORDER BY exe_cours_id ASC, exe_date ASC";
-		}
+        }
 
-		$results=getManyResultsXCol($sql,8);
-		$hpresults=getManyResultsXCol($hpsql,7);
+        $results=getManyResultsXCol($sql,8);
+        $hpresults=getManyResultsXCol($hpsql,7);
+
+        $NoTestRes = 0;
+        $NoHPTestRes = 0;
+        $j=0;
+        //Print the results of tests
+        if (is_array($results)) {
+            for ($i = 0; $i < sizeof($results); $i++) {
+                $return[$i] = array();
+                $id = $results[$i][5];
+                $mailid = $results[$i][6];
+                $user = $results[$i][0];
+                $test = $results[$i][1];
+                $res = $results[$i][2];
+                if(empty($user_id)) {
+                    $user = $results[$i][0];
+                    $return[$i]['user'] = $user;
+                    $return[$i]['user_id'] = $results[$i][7];
+                }
+                $return[$i]['title'] = $test;
+                $return[$i]['time'] = api_convert_and_format_date($results[$i][4], null, date_default_timezone_get());
+                $return[$i]['result'] = $res;
+                $return[$i]['max'] = $results[$i][3];
+                $j=$i;
+            }
+        }
+        $j++;
+        // Print the Result of Hotpotatoes Tests
+        if (is_array($hpresults)) {
+            for ($i = 0; $i < sizeof($hpresults); $i++) {
+                $return[$j+$i] = array();
+                $title = GetQuizName($hpresults[$i][1],$document_path);
+                if ($title =='') {
+                    $title = basename($hpresults[$i][1]);
+                }
+                if (empty($user_id)) {
+                    $return[$j+$i]['user'] = $hpresults[$i][0];
+                    $return[$j+$i]['user_id'] = $results[$i][6];
+
+                }
+                $return[$j+$i]['title'] = $title;
+                $return[$j+$i]['time'] = api_convert_and_format_date($hpresults[$i][4], null, date_default_timezone_get());
+                $return[$j+$i]['result'] = $hpresults[$i][2];
+                $return[$j+$i]['max'] = $hpresults[$i][3];
+            }
+        }
+        $this->results = $return;
+        return true;
+    }
 
-		$NoTestRes = 0;
-		$NoHPTestRes = 0;
-		$j=0;
-		//Print the results of tests
-		if (is_array($results)) {
-			for ($i = 0; $i < sizeof($results); $i++) {
-				$return[$i] = array();
-				$id = $results[$i][5];
-				$mailid = $results[$i][6];
-				$user = $results[$i][0];
-				$test = $results[$i][1];
-				$res = $results[$i][2];
-				if(empty($user_id)) {
-					$user = $results[$i][0];
-					$return[$i]['user'] = $user;
-					$return[$i]['user_id'] = $results[$i][7];
-				}
-				$return[$i]['title'] = $test;
-				$return[$i]['time'] = api_convert_and_format_date($results[$i][4], null, date_default_timezone_get());
-				$return[$i]['result'] = $res;
-				$return[$i]['max'] = $results[$i][3];
-				$j=$i;
-			}
-		}
-		$j++;
-		// Print the Result of Hotpotatoes Tests
-		if (is_array($hpresults)) {
-			for ($i = 0; $i < sizeof($hpresults); $i++) {
-				$return[$j+$i] = array();
-				$title = GetQuizName($hpresults[$i][1],$document_path);
-				if ($title =='') {
-					$title = basename($hpresults[$i][1]);
-				}
-				if (empty($user_id)) {
-					$return[$j+$i]['user'] = $hpresults[$i][0];
-					$return[$j+$i]['user_id'] = $results[$i][6];
+    /**
+     * Exports the complete report as a CSV file
+     * @param	string		Document path inside the document tool
+     * @param	integer		Optional user ID
+     * @param	boolean		Whether to include user fields or not
+     * @return	boolean		False on error
+     */
+    public function exportCompleteReportCSV($dato)
+    {
+        //$this->_getGradeBookReporting($document_path,$user_id);
+        $filename = 'gradebook_results_'.gmdate('YmdGis').'.csv';
+        if (!empty($user_id)) {
+            $filename = 'gradebook_results_user_'.$user_id.'_'.gmdate('YmdGis').'.csv';
+        }
+        $data = '';
+        //build the results
+        //titles
 
-				}
-				$return[$j+$i]['title'] = $title;
-				$return[$j+$i]['time'] = api_convert_and_format_date($hpresults[$i][4], null, date_default_timezone_get());
-				$return[$j+$i]['result'] = $hpresults[$i][2];
-				$return[$j+$i]['max'] = $hpresults[$i][3];
-			}
-		}
-		$this->results = $return;
-		return true;
-	}
-	/**
-	 * Exports the complete report as a CSV file
-	 * @param	string		Document path inside the document tool
-	 * @param	integer		Optional user ID
-	 * @param	boolean		Whether to include user fields or not
-	 * @return	boolean		False on error
-	 */
-	public function exportCompleteReportCSV($dato) {
-		//$this->_getGradeBookReporting($document_path,$user_id);
-		$filename = 'gradebook_results_'.gmdate('YmdGis').'.csv';
-		if (!empty($user_id)) {
-			$filename = 'gradebook_results_user_'.$user_id.'_'.gmdate('YmdGis').'.csv';
-		}
-		$data = '';
-		//build the results
-		//titles
+        foreach ($dato[0] as $header_col) {
+            if(!empty($header_col)) {
+                $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($header_col))).';';
+            }
+        }
 
-		foreach ($dato[0] as $header_col) {
-			if(!empty($header_col)) {
-				$data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($header_col))).';';
-			}
-		}
+        $data .="\r\n";
+        $cant_students = count($dato[1]);
+        //print_r($data);		exit();
 
-		$data .="\r\n";
-		$cant_students = count($dato[1]);
-		//print_r($data);		exit();
+        for($i=0;$i<$cant_students;$i++) {
+            $column = 0;
+            foreach($dato[1][$i] as $col_name) {
+                $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($col_name))).';';
+            }
+            $data .="\r\n";
+        }
 
-		for($i=0;$i<$cant_students;$i++) {
-			$column = 0;
-			foreach($dato[1][$i] as $col_name) {
-				$data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($col_name))).';';
-			}
-			$data .="\r\n";
-		}
+        //output the results
+        $len = strlen($data);
+        header('Content-type: application/octet-stream');
+        header('Content-Type: application/force-download');
+        header('Content-length: '.$len);
+        if (preg_match("/MSIE 5.5/", $_SERVER['HTTP_USER_AGENT'])) {
+            header('Content-Disposition: filename= '.$filename);
+        } else {
+            header('Content-Disposition: attachment; filename= '.$filename);
+        } if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE')) {
+            header('Pragma: ');
+            header('Cache-Control: ');
+            header('Cache-Control: public'); // IE cannot download from sessions without a cache
+        }
+        header('Content-Description: '.$filename);
+        header('Content-transfer-encoding: binary');
+        echo $data;
+        return true;
+    }
 
-		//output the results
-		$len = strlen($data);
-		header('Content-type: application/octet-stream');
-		header('Content-Type: application/force-download');
-		header('Content-length: '.$len);
-		if (preg_match("/MSIE 5.5/", $_SERVER['HTTP_USER_AGENT'])) {
-			header('Content-Disposition: filename= '.$filename);
-		} else {
-			header('Content-Disposition: attachment; filename= '.$filename);
-		} if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE')) {
-			header('Pragma: ');
-			header('Cache-Control: ');
-			header('Cache-Control: public'); // IE cannot download from sessions without a cache
-		}
-		header('Content-Description: '.$filename);
-		header('Content-transfer-encoding: binary');
-		echo $data;
-		return true;
-	}
-	/**
-	 * Exports the complete report as an XLS file
-	 * @return	boolean		False on error
-	 */
-	public function exportCompleteReportXLS($data) {	    
-	   	$filename = 'gradebook-results-'.date('Y-m-d-h:i:s').'.xls';
-		include api_get_path(LIBRARY_PATH).'pear/Spreadsheet_Excel_Writer/Writer.php';        
-		$workbook = new Spreadsheet_Excel_Writer();
+    /**
+     * Exports the complete report as an XLS file
+     * @return	boolean		False on error
+     */
+    public function exportCompleteReportXLS($data)
+    {
+        $filename = 'gradebook-results-'.date('Y-m-d-h:i:s').'.xls';
+        include api_get_path(LIBRARY_PATH).'pear/Spreadsheet_Excel_Writer/Writer.php';
+        $workbook = new Spreadsheet_Excel_Writer();
         $workbook->setVersion(8); // BIFF8
         $workbook->setTempDir(api_get_path(SYS_ARCHIVE_PATH));
-		$workbook->send($filename);
-        
-		$worksheet =& $workbook->addWorksheet('Report');
+        $workbook->send($filename);
+
+        $worksheet =& $workbook->addWorksheet('Report');
         $worksheet->setInputEncoding(api_get_system_encoding());
-          
-		$line = 0;
-		$column = 0; //skip the first column (row titles)
 
-		//headers
-		foreach ($data[0] as $header_col) {		    
-			$worksheet->write($line, $column, $header_col);
-			$column++;
-		}
-		$line++;    
+        $line = 0;
+        $column = 0; //skip the first column (row titles)
+
+        //headers
+        foreach ($data[0] as $header_col) {
+            $worksheet->write($line, $column, $header_col);
+            $column++;
+        }
+        $line++;
 
-		$cant_students = count($data[1]);
-		
-		for ($i=0;$i<$cant_students;$i++) {
-			$column = 0;
-			foreach ($data[1][$i] as $col_name) {
-				$worksheet->write($line,$column, html_entity_decode(strip_tags($col_name)));
-				$column++;
-			}
-			$line++;
-		}
+        $cant_students = count($data[1]);
+
+        for ($i=0;$i<$cant_students;$i++) {
+            $column = 0;
+            foreach ($data[1][$i] as $col_name) {
+                $worksheet->write($line,$column, html_entity_decode(strip_tags($col_name)));
+                $column++;
+            }
+            $line++;
+        }
         $workbook->close();
         exit;
-			
-	}
-	/**
-	 * Exports the complete report as a DOCX file
-	 * @return	boolean		False on error
-	 */
-	public function exportCompleteReportDOC($data) {
+    }
+
+    /**
+     * Exports the complete report as a DOCX file
+     * @return	boolean		False on error
+     */
+    public function exportCompleteReportDOC($data)
+    {
         global $_course;
         $filename = 'gb_results_'.$_course['code'].'_'.gmdate('YmdGis');
         $filepath = api_get_path(SYS_ARCHIVE_PATH).$filename;
@@ -308,12 +307,12 @@ class GradeBookResult
         $docx->addList($values, $params);
         //$docx->addFooter('', $paramsHeader);
         $paramsPage = array(
-        //    'titlePage' => 1,
+            //    'titlePage' => 1,
             'orient' => 'landscape',
-        //    'top' => 4000,
-        //    'bottom' => 4000,
-        //    'right' => 4000,
-        //    'left' => 4000
+            //    'top' => 4000,
+            //    'bottom' => 4000,
+            //    'right' => 4000,
+            //    'left' => 4000
         );
         $docx->createDocx($filepath,$paramsPage);
         //output the results
@@ -331,4 +330,3 @@ class GradeBookResult
         return true;
     }
 }
-endif;
diff --git a/main/gradebook/gradebook_scoring_system.php b/main/gradebook/gradebook_scoring_system.php
index 56b61720e1..a8c2ebf224 100755
--- a/main/gradebook/gradebook_scoring_system.php
+++ b/main/gradebook/gradebook_scoring_system.php
@@ -1,12 +1,11 @@
 <?php
 /* For licensing terms, see /license.txt */
+
 /**
  * Script
  * @package chamilo.gradebook
  */
-/**
- * Init
- */
+
 $language_file= 'gradebook';
 
 require_once '../inc/global.inc.php';
diff --git a/main/gradebook/gradebook_showlog_eval.php b/main/gradebook/gradebook_showlog_eval.php
index f0bd53698d..9e90da62d4 100755
--- a/main/gradebook/gradebook_showlog_eval.php
+++ b/main/gradebook/gradebook_showlog_eval.php
@@ -1,12 +1,10 @@
-<?php // $Id: $
+<?php
 /* For licensing terms, see /license.txt */
 /**
  * Script
  * @package chamilo.gradebook
  */
-/**
- * Init
- */
+
 $language_file = 'gradebook';
 //$cidReset = true;
 require_once '../inc/global.inc.php';
@@ -18,16 +16,16 @@ api_block_anonymous_users();
 block_students();
 
 $interbreadcrumb[] = array (
-	'url' => $_SESSION['gradebook_dest'].'?',
-	'name' => get_lang('Gradebook'
+    'url' => $_SESSION['gradebook_dest'].'?',
+    'name' => get_lang('Gradebook'
 ));
 $interbreadcrumb[] = array (
-	'url' => $_SESSION['gradebook_dest'].'?selectcat='.Security::remove_XSS($_GET['selectcat']),
-	'name' => get_lang('Details'
+    'url' => $_SESSION['gradebook_dest'].'?selectcat='.Security::remove_XSS($_GET['selectcat']),
+    'name' => get_lang('Details'
 ));
 $interbreadcrumb[] = array (
-	'url' => 'gradebook_showlog_eval.php?visiblelog='.Security::remove_XSS($_GET['visiblelog']).'&amp;selectcat='.Security::remove_XSS($_GET['selectcat']),
-	'name' => get_lang('GradebookQualifyLog')
+    'url' => 'gradebook_showlog_eval.php?visiblelog='.Security::remove_XSS($_GET['visiblelog']).'&amp;selectcat='.Security::remove_XSS($_GET['selectcat']),
+    'name' => get_lang('GradebookQualifyLog')
 );
 $this_section = SECTION_COURSES;
 Display :: display_header('');
@@ -39,17 +37,17 @@ $t_user=	 Database :: get_main_table(TABLE_MAIN_USER);
 $visible_log=Security::remove_XSS($_GET['visiblelog']);
 
 $evaledit = Evaluation :: load($visible_log);
-$sql="SELECT le.name,le.description,le.weight,le.visible,le.type,le.created_at,us.username FROM ".$t_linkeval_log." le INNER JOIN ".$t_user." us 
+$sql="SELECT le.name,le.description,le.weight,le.visible,le.type,le.created_at,us.username FROM ".$t_linkeval_log." le INNER JOIN ".$t_user." us
       ON le.user_id_log=us.user_id where id_linkeval_log=".$evaledit[0]->get_id()." and type='evaluation';";
 $result=Database::query($sql);
 $list_info=array();
 while ($row=Database::fetch_row($result)) {
-	$list_info[]=$row; 
+    $list_info[]=$row;
 }
 
-foreach($list_info as $key => $info_log) {	
-	$list_info[$key][5]=($info_log[5]) ? api_convert_and_format_date($info_log[5]) : 'N/A';
-	$list_info[$key][3]=($info_log[3]==1) ? get_lang('GradebookVisible') : get_lang('GradebookInvisible');
+foreach($list_info as $key => $info_log) {
+    $list_info[$key][5]=($info_log[5]) ? api_convert_and_format_date($info_log[5]) : 'N/A';
+    $list_info[$key][3]=($info_log[3]==1) ? get_lang('GradebookVisible') : get_lang('GradebookInvisible');
 }
 
 $parameters=array('visiblelog'=>$visible_log,'selectcat'=>intval($_GET['selectcat']));
diff --git a/main/gradebook/gradebook_showlog_link.php b/main/gradebook/gradebook_showlog_link.php
index 621ac4f256..857a6dd592 100755
--- a/main/gradebook/gradebook_showlog_link.php
+++ b/main/gradebook/gradebook_showlog_link.php
@@ -1,12 +1,11 @@
-<?php // $Id: $
+<?php
 /* For licensing terms, see /license.txt */
+
 /**
  * Script
  * @package chamilo.gradebook
  */
-/**
- * Init
- */
+
 $language_file = 'gradebook';
 //$cidReset = true;
 require_once '../inc/global.inc.php';
@@ -35,17 +34,16 @@ $sql="SELECT lk.name,lk.description,lk.weight,lk.visible,lk.type,lk.created_at,u
 $result=Database::query($sql);
 $list_info=array();
 while ($row=Database::fetch_row($result)) {
-	$list_info[]=$row;
+    $list_info[] = $row;
 }
 
 foreach($list_info as $key => $info_log) {
-	$list_info[$key][5]=($info_log[5]) ? api_convert_and_format_date($info_log[5]) : 'N/A';
-	$list_info[$key][3]=($info_log[3]==1) ? get_lang('GradebookVisible') : get_lang('GradebookInvisible');
+    $list_info[$key][5]=($info_log[5]) ? api_convert_and_format_date($info_log[5]) : 'N/A';
+    $list_info[$key][3]=($info_log[3]==1) ? get_lang('GradebookVisible') : get_lang('GradebookInvisible');
 }
 
 $parameters=array('visiblelink'=>Security::remove_XSS($_GET['visiblelink']),'selectcat'=>Security::remove_XSS($_GET['selectcat']));
 
-
 $table = new SortableTableFromArrayConfig($list_info, 1,20,'gradebooklink');
 $table->set_additional_parameters($parameters);
 $table->set_header(0, get_lang('GradebookNameLog'));
diff --git a/main/gradebook/gradebook_statistics.php b/main/gradebook/gradebook_statistics.php
index 2570d28a01..cb9d2a6aaf 100755
--- a/main/gradebook/gradebook_statistics.php
+++ b/main/gradebook/gradebook_statistics.php
@@ -1,12 +1,10 @@
 <?php
 /* For licensing terms, see /license.txt */
+
 /**
  * Script
  * @package chamilo.gradebook
  */
-/**
- * Init
- */
 
 $language_file= array('gradebook','tracking');
 
@@ -20,22 +18,22 @@ require_once 'lib/fe/displaygradebook.php';
 api_block_anonymous_users();
 
 $eval= Evaluation :: load($_GET['selecteval']);
-if ($eval[0]->get_category_id() < 0) { 
-	// if category id is negative, then the evaluation's origin is a link
-	$link= LinkFactory :: get_evaluation_link($eval[0]->get_id());
-	$currentcat = Category :: load($link->get_category_id());
+if ($eval[0]->get_category_id() < 0) {
+    // if category id is negative, then the evaluation's origin is a link
+    $link= LinkFactory :: get_evaluation_link($eval[0]->get_id());
+    $currentcat = Category :: load($link->get_category_id());
 } else {
-	$currentcat = Category :: load($eval[0]->get_category_id());
+    $currentcat = Category :: load($eval[0]->get_category_id());
 }
 
 $interbreadcrumb[]= array (
-	'url' => $_SESSION['gradebook_dest'].'?selectcat=' . $currentcat[0]->get_id(), 'name' => get_lang('ToolGradebook'));
+    'url' => $_SESSION['gradebook_dest'].'?selectcat=' . $currentcat[0]->get_id(), 'name' => get_lang('ToolGradebook'));
 
 if (api_is_allowed_to_edit()) {
-	$interbreadcrumb[]= array (
-	'url' => 'gradebook_view_result.php?selecteval=' . Security::remove_XSS($_GET['selecteval']),
-	'name' => get_lang('ViewResult'
-	));
+    $interbreadcrumb[]= array (
+        'url' => 'gradebook_view_result.php?selecteval=' . Security::remove_XSS($_GET['selecteval']),
+        'name' => get_lang('ViewResult'
+    ));
 }
 $displayscore = ScoreDisplay :: instance();
 
@@ -44,56 +42,56 @@ DisplayGradebook::display_header_result($eval[0], $currentcat[0]->get_id(), 0, '
 
 //Bad, Regular, Good  - User definitions
 $displays = $displayscore->get_custom_score_display_settings();
-    
+
 if (!$displayscore->is_custom() || empty($displays)) {
     if (api_is_platform_admin() || api_is_course_admin()) {
-	   Display :: display_error_message(get_lang('PleaseEnableScoringSystem'),false);
+        Display :: display_error_message(get_lang('PleaseEnableScoringSystem'),false);
+    }
+} else {
+    $allresults = Result::load(null,null,$eval[0]->get_id());
+    $nr_items = array();
+    foreach ($displays as $itemsdisplay) {
+        $nr_items[$itemsdisplay['display']] = 0;
+    }
+
+    $resultcount = 0;
+    foreach ($allresults as $result) {
+        $score = $result->get_score();
+        if (isset($score)) {
+            $display = $displayscore->display_score(array($score, $eval[0]->get_max()), SCORE_CUSTOM, SCORE_ONLY_CUSTOM, true);
+            $nr_items[$display]++;
+            $resultcount++;
+        }
     }
-} else {    	
-	$allresults = Result::load(null,null,$eval[0]->get_id());	
-	$nr_items = array();
-	foreach ($displays as $itemsdisplay) {
-		$nr_items[$itemsdisplay['display']] = 0;
-	}
-	
-	$resultcount = 0;
-	foreach ($allresults as $result) {
-		$score = $result->get_score();		
-		if (isset($score)) {		    
-			$display = $displayscore->display_score(array($score, $eval[0]->get_max()), SCORE_CUSTOM, SCORE_ONLY_CUSTOM, true);			
-			$nr_items[$display]++;
-			$resultcount++;
-		}
-	}
-
-	$keys = array_keys($nr_items);
-
-	// find the region with the most scores, this is 100% of the bar
-
-	$highest_ratio = 0;
-	foreach($keys as $key) {
-		if ($nr_items[$key] > $highest_ratio) {
-		    $highest_ratio = $nr_items[$key];
-		}
-	}
-
-	// Generate table
-	$stattable= '<table class="data_table" cellspacing="0" cellpadding="3">';
-	$stattable .= '<tr><th>' . get_lang('ScoringSystem') . '</th>';
+
+    $keys = array_keys($nr_items);
+
+    // find the region with the most scores, this is 100% of the bar
+
+    $highest_ratio = 0;
+    foreach($keys as $key) {
+        if ($nr_items[$key] > $highest_ratio) {
+            $highest_ratio = $nr_items[$key];
+        }
+    }
+
+    // Generate table
+    $stattable= '<table class="data_table" cellspacing="0" cellpadding="3">';
+    $stattable .= '<tr><th>' . get_lang('ScoringSystem') . '</th>';
     $stattable .= '<th>' . get_lang('Percentage') . '</th>';
     $stattable .= '<th>' . get_lang('CountUsers') . '</th>';
     //$stattable .= '<th>' . get_lang('Statistics') . '</th></tr>';
-	$counter=0;    
-	foreach ($keys as $key) {
-		$bar = ($highest_ratio > 0?($nr_items[$key] / $highest_ratio) * 100:0);
-		$stattable .= '<tr class="row_' . ($counter % 2 == 0 ? 'odd' : 'even') . '">';
-		$stattable .= '<td width="150">' . $key . '</td>';
-        
-		$stattable .= '<td width="550">'.Display::bar_progress($bar).'</td>';
-		$stattable .= '<td align="right">' . $nr_items[$key] . '</td>';		
-		$counter++;
-	}
-	$stattable .= '</tr></table>';
-	echo $stattable;
+    $counter=0;
+    foreach ($keys as $key) {
+        $bar = ($highest_ratio > 0?($nr_items[$key] / $highest_ratio) * 100:0);
+        $stattable .= '<tr class="row_' . ($counter % 2 == 0 ? 'odd' : 'even') . '">';
+        $stattable .= '<td width="150">' . $key . '</td>';
+
+        $stattable .= '<td width="550">'.Display::bar_progress($bar).'</td>';
+        $stattable .= '<td align="right">' . $nr_items[$key] . '</td>';
+        $counter++;
+    }
+    $stattable .= '</tr></table>';
+    echo $stattable;
 }
 Display :: display_footer();
diff --git a/main/gradebook/gradebook_view_result.php b/main/gradebook/gradebook_view_result.php
index 085db598a6..832c7b2e2a 100755
--- a/main/gradebook/gradebook_view_result.php
+++ b/main/gradebook/gradebook_view_result.php
@@ -1,13 +1,10 @@
 <?php
-
 /* For licensing terms, see /license.txt */
+
 /**
  * Script
  * @package chamilo.gradebook
  */
-/**
- * Init
- */
 $language_file[] = 'gradebook';
 
 require_once '../inc/global.inc.php';
@@ -34,7 +31,7 @@ block_students();
 $interbreadcrumb[] = array(
     'url' => $_SESSION['gradebook_dest'],
     'name' => get_lang('Gradebook'
-        ));
+    ));
 
 //load the evaluation & category
 $select_eval = Security::remove_XSS($_GET['selecteval']);
@@ -321,12 +318,14 @@ if (isset($_GET['export'])) {
         }
     }
 }
+
 if (isset($_GET['resultdelete'])) {
     $result = Result :: load($_GET['resultdelete']);
     $result[0]->delete();
     header('Location: gradebook_view_result.php?deleteresult=&selecteval=' . Security::remove_XSS($_GET['selecteval']));
     exit;
 }
+
 if (isset($_POST['action'])) {
     $number_of_selected_items = count($_POST['id']);
     if ($number_of_selected_items == '0') {
@@ -380,7 +379,7 @@ if (isset($_GET['print'])) {
 }
 
 $htmlHeadXtra[] = '<script type="text/javascript">
-	
+
 function confirmationuser() {
     if (confirm("' . get_lang('DeleteUser') . '?"))
     	{return true;}
diff --git a/main/gradebook/index.php b/main/gradebook/index.php
index 6b76bf1afa..48996ab5ec 100755
--- a/main/gradebook/index.php
+++ b/main/gradebook/index.php
@@ -4,10 +4,9 @@
  * Gradebook controller
  * @package chamilo.gradebook
  */
-/**
- * Init
- */
+
 $language_file = array('gradebook', 'exercice');
+
 // $cidReset : This is the main difference with gradebook.php, here we say,
 // basically, that we are inside a course, and many things depend from that
 $cidReset= false;
@@ -107,7 +106,6 @@ function confirmation() {
 $tbl_forum_thread = Database :: get_course_table(TABLE_FORUM_THREAD);
 $tbl_attendance   = Database :: get_course_table(TABLE_ATTENDANCE);
 $tbl_grade_links  = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
-//$status           = CourseManager::get_user_in_course_status($stud_id, $course_code);
 $filter_confirm_msg = true;
 $filter_warning_msg = true;
 
@@ -123,301 +121,314 @@ if (empty($cats)) {
 $_GET['selectcat'] = $cats[0]->get_id();
 
 if (isset($_GET['isStudentView'])) {
-	if ( (isset($_GET['selectcat']) && $_GET['selectcat']>0) && (isset($_SESSION['studentview']) && $_SESSION['studentview']=='studentview') ) {
-		$interbreadcrumb[]= array ('url' => 'index.php'.'?selectcat=0&amp;isStudentView='.$_GET['isStudentView'],'name' => get_lang('ToolGradebook'));
-	}
+    if ( (isset($_GET['selectcat']) && $_GET['selectcat']>0) && (isset($_SESSION['studentview']) && $_SESSION['studentview']=='studentview') ) {
+        $interbreadcrumb[]= array ('url' => 'index.php'.'?selectcat=0&amp;isStudentView='.$_GET['isStudentView'],'name' => get_lang('ToolGradebook'));
+    }
 }
 
 if ((isset($_GET['selectcat']) && $_GET['selectcat']>0) && (isset($_SESSION['studentview']) && $_SESSION['studentview']=='studentview')) {
-	Display :: display_header();
-	//Introduction tool: student view
-	Display::display_introduction_section(TOOL_GRADEBOOK, array('ToolbarSet' => 'AssessmentsIntroduction'));
-	$category = $_GET['selectcat'];
-	$cats = Category :: load ($category, null, null, null, null, null, false);
-	$allcat = $cats[0]->get_subcategories($stud_id, $course_code, $session_id);
-	$alleval = $cats[0]->get_evaluations($stud_id);
-	$alllink = $cats[0]->get_links($stud_id);
-	$addparams = array();
-	$gradebooktable= new GradebookTable($cats[0], $allcat, $alleval,$alllink, $addparams);
-	$gradebooktable->display();
-	Display :: display_footer();
-	exit;
+    Display :: display_header();
+    //Introduction tool: student view
+    Display::display_introduction_section(TOOL_GRADEBOOK, array('ToolbarSet' => 'AssessmentsIntroduction'));
+    $category = $_GET['selectcat'];
+    $cats = Category :: load ($category, null, null, null, null, null, false);
+    $allcat = $cats[0]->get_subcategories($stud_id, $course_code, $session_id);
+    $alleval = $cats[0]->get_evaluations($stud_id);
+    $alllink = $cats[0]->get_links($stud_id);
+    $addparams = array();
+    $gradebooktable= new GradebookTable($cats[0], $allcat, $alleval,$alllink, $addparams);
+    $gradebooktable->display();
+    Display :: display_footer();
+    exit;
 } else {
-	if (!isset($_GET['selectcat']) && ($_SESSION['studentview']=='studentview') || (isset($_GET['isStudentView']) && $_GET['isStudentView']=='true') ) {
-		//	if ( !isset($_GET['selectcat']) && ($_SESSION['studentview']=='studentview') && ($status<>1 && !api_is_platform_admin()) || (isset($_GET['isStudentView']) && $_GET['isStudentView']=='true' && $status<>1 && !api_is_platform_admin()) ) {
-		Display :: display_header(get_lang('Gradebook'));
-
-		//Introduction tool: student view
-		Display::display_introduction_section(TOOL_GRADEBOOK, array('ToolbarSet' => 'AssessmentsIntroduction'));
-		$addparams=array();
-		$cats = Category :: load (0, null, null, null, null, null, false);
-		$allcat= $cats[0]->get_subcategories($stud_id, $course_code, $session_id);
-		$alleval= $cats[0]->get_evaluations($stud_id);
-		$alllink= $cats[0]->get_links($stud_id);
-		$gradebooktable= new GradebookTable($cats[0], $allcat, $alleval,$alllink, $addparams);
-		$gradebooktable->display();
-		Display :: display_footer();
-		exit;
-	}
+    if (!isset($_GET['selectcat']) && ($_SESSION['studentview']=='studentview') || (isset($_GET['isStudentView']) && $_GET['isStudentView']=='true') ) {
+        //	if ( !isset($_GET['selectcat']) && ($_SESSION['studentview']=='studentview') && ($status<>1 && !api_is_platform_admin()) || (isset($_GET['isStudentView']) && $_GET['isStudentView']=='true' && $status<>1 && !api_is_platform_admin()) ) {
+        Display :: display_header(get_lang('Gradebook'));
+
+        //Introduction tool: student view
+        Display::display_introduction_section(TOOL_GRADEBOOK, array('ToolbarSet' => 'AssessmentsIntroduction'));
+        $addparams=array();
+        $cats = Category :: load (0, null, null, null, null, null, false);
+        $allcat= $cats[0]->get_subcategories($stud_id, $course_code, $session_id);
+        $alleval= $cats[0]->get_evaluations($stud_id);
+        $alllink= $cats[0]->get_links($stud_id);
+        $gradebooktable= new GradebookTable($cats[0], $allcat, $alleval,$alllink, $addparams);
+        $gradebooktable->display();
+        Display :: display_footer();
+        exit;
+    }
 }
 
 // ACTIONS
 //this is called when there is no data for the course admin
 if (isset ($_GET['createallcategories'])) {
-	block_students();
-	$coursecat= Category :: get_not_created_course_categories($stud_id);
-	if (!count($coursecat) == 0) {
-		foreach ($coursecat as $row) {
-			$cat= new Category();
-			$cat->set_name($row[1]);
-			$cat->set_course_code($row[0]);
-			$cat->set_description(null);
-			$cat->set_user_id($stud_id);
-			$cat->set_parent_id(0);
-			$cat->set_weight(0);
-			$cat->set_visible(0);
-			$cat->add();
-			unset ($cat);
-		}
-	}
-	header('Location: '.$_SESSION['gradebook_dest'].'?addallcat=&selectcat=0');
-	exit;
+    block_students();
+    $coursecat= Category :: get_not_created_course_categories($stud_id);
+    if (!count($coursecat) == 0) {
+        foreach ($coursecat as $row) {
+            $cat= new Category();
+            $cat->set_name($row[1]);
+            $cat->set_course_code($row[0]);
+            $cat->set_description(null);
+            $cat->set_user_id($stud_id);
+            $cat->set_parent_id(0);
+            $cat->set_weight(0);
+            $cat->set_visible(0);
+            $cat->add();
+            unset ($cat);
+        }
+    }
+    header('Location: '.$_SESSION['gradebook_dest'].'?addallcat=&selectcat=0');
+    exit;
 }
 
 //show logs evaluations
 if (isset ($_GET['visiblelog'])) {
-	header('Location: ' . api_get_self().'/gradebook_showlog_eval.php');
-	exit;
+    header('Location: ' . api_get_self().'/gradebook_showlog_eval.php');
+    exit;
 }
 
 //move a category
 if (isset ($_GET['movecat'])) {
-	block_students();
-	$cats= Category :: load($_GET['movecat']);
-	if (!isset ($_GET['targetcat'])) {
-		$move_form= new CatForm(CatForm :: TYPE_MOVE,
-		$cats[0],
-		'move_cat_form',
-		null,
-		api_get_self() . '?movecat=' . Security::remove_XSS($_GET['movecat'])
-		. '&selectcat=' . Security::remove_XSS($_GET['selectcat']));
-			if ($move_form->validate()) {
-				header('Location: ' . api_get_self() . '?selectcat=' . Security::remove_XSS($_GET['selectcat'])
-				 . '&movecat=' . Security::remove_XSS($_GET['movecat'])
-				 . '&targetcat=' . $move_form->exportValue('move_cat'));
-				 exit;
-			}
-		} else {
-			$targetcat= Category :: load($_GET['targetcat']);
-			$course_to_crsind = ($cats[0]->get_course_code() != null && $targetcat[0]->get_course_code() == null);
-
-			if (!($course_to_crsind && !isset($_GET['confirm']))) {
-				$cats[0]->move_to_cat($targetcat[0]);
-				header('Location: ' . api_get_self() . '?categorymoved=&selectcat=' . Security::remove_XSS($_GET['selectcat']));
-				exit;
-				}
-				unset ($targetcat);
-		}
-	unset ($cats);
+    block_students();
+    $cats= Category :: load($_GET['movecat']);
+    if (!isset ($_GET['targetcat'])) {
+        $move_form= new CatForm(CatForm :: TYPE_MOVE,
+            $cats[0],
+            'move_cat_form',
+            null,
+            api_get_self() . '?movecat=' . Security::remove_XSS($_GET['movecat'])
+            . '&selectcat=' . Security::remove_XSS($_GET['selectcat']));
+        if ($move_form->validate()) {
+            header('Location: ' . api_get_self() . '?selectcat=' . Security::remove_XSS($_GET['selectcat'])
+                . '&movecat=' . Security::remove_XSS($_GET['movecat'])
+                . '&targetcat=' . $move_form->exportValue('move_cat'));
+            exit;
+        }
+    } else {
+        $targetcat= Category :: load($_GET['targetcat']);
+        $course_to_crsind = ($cats[0]->get_course_code() != null && $targetcat[0]->get_course_code() == null);
+
+        if (!($course_to_crsind && !isset($_GET['confirm']))) {
+            $cats[0]->move_to_cat($targetcat[0]);
+            header('Location: ' . api_get_self() . '?categorymoved=&selectcat=' . Security::remove_XSS($_GET['selectcat']));
+            exit;
+        }
+        unset ($targetcat);
+    }
+    unset ($cats);
 }
 
 //move an evaluation
 if (isset ($_GET['moveeval'])) {
-	block_students();
-	$evals= Evaluation :: load($_GET['moveeval']);
-	if (!isset ($_GET['targetcat'])) {
-
-		$move_form= new EvalForm(EvalForm :: TYPE_MOVE,
-		$evals[0],
-		null,
-		'move_eval_form',
-		null,
-		api_get_self() . '?moveeval=' . Security::remove_XSS($_GET['moveeval'])
-		. '&selectcat=' . Security::remove_XSS($_GET['selectcat']));
-
-		if ($move_form->validate()) {
-			header('Location: ' .api_get_self() . '?selectcat=' . Security::remove_XSS($_GET['selectcat'])
-			. '&moveeval=' . Security::remove_XSS($_GET['moveeval'])
-			. '&targetcat=' . $move_form->exportValue('move_cat'));
-			exit;
-			}
-		} else {
-		$targetcat= Category :: load($_GET['targetcat']);
-		$course_to_crsind = ($evals[0]->get_course_code() != null && $targetcat[0]->get_course_code() == null);
-
-		if (!($course_to_crsind && !isset($_GET['confirm']))) {
-			$evals[0]->move_to_cat($targetcat[0]);
-			header('Location: ' . api_get_self() . '?evaluationmoved=&selectcat=' . Security::remove_XSS($_GET['selectcat']));
-			exit;
-		}
-		unset ($targetcat);
-	}
-	unset ($evals);
+    block_students();
+    $evals= Evaluation :: load($_GET['moveeval']);
+    if (!isset ($_GET['targetcat'])) {
+
+        $move_form= new EvalForm(EvalForm :: TYPE_MOVE,
+            $evals[0],
+            null,
+            'move_eval_form',
+            null,
+            api_get_self() . '?moveeval=' . Security::remove_XSS($_GET['moveeval'])
+            . '&selectcat=' . Security::remove_XSS($_GET['selectcat']));
+
+        if ($move_form->validate()) {
+            header('Location: ' .api_get_self() . '?selectcat=' . Security::remove_XSS($_GET['selectcat'])
+                . '&moveeval=' . Security::remove_XSS($_GET['moveeval'])
+                . '&targetcat=' . $move_form->exportValue('move_cat'));
+            exit;
+        }
+    } else {
+        $targetcat= Category :: load($_GET['targetcat']);
+        $course_to_crsind = ($evals[0]->get_course_code() != null && $targetcat[0]->get_course_code() == null);
+
+        if (!($course_to_crsind && !isset($_GET['confirm']))) {
+            $evals[0]->move_to_cat($targetcat[0]);
+            header('Location: ' . api_get_self() . '?evaluationmoved=&selectcat=' . Security::remove_XSS($_GET['selectcat']));
+            exit;
+        }
+        unset ($targetcat);
+    }
+    unset ($evals);
 }
 
 //move a link
 if (isset ($_GET['movelink'])) {
-	block_students();
-	$link= LinkFactory :: load($_GET['movelink']);
-	$move_form= new LinkForm(LinkForm :: TYPE_MOVE, null, $link[0], 'move_link_form', null, api_get_self() . '?movelink=' . $_GET['movelink'] . '&selectcat=' . Security::remove_XSS($_GET['selectcat']));
-
-	if ($move_form->validate()) {
-		$targetcat= Category :: load($move_form->exportValue('move_cat'));
-		$link[0]->move_to_cat($targetcat[0]);
-		unset ($link);
-		header('Location: ' . api_get_self(). '?linkmoved=&selectcat=' . Security::remove_XSS($_GET['selectcat']));
-		exit;
-	}
+    block_students();
+    $link= LinkFactory :: load($_GET['movelink']);
+    $move_form = new LinkForm(
+        LinkForm :: TYPE_MOVE,
+        null,
+        $link[0],
+        'move_link_form',
+        null,
+        api_get_self() . '?movelink=' . $_GET['movelink'] . '&selectcat=' . Security::remove_XSS($_GET['selectcat'])
+    );
+
+    if ($move_form->validate()) {
+        $targetcat= Category :: load($move_form->exportValue('move_cat'));
+        $link[0]->move_to_cat($targetcat[0]);
+        unset ($link);
+        header('Location: ' . api_get_self(). '?linkmoved=&selectcat=' . Security::remove_XSS($_GET['selectcat']));
+        exit;
+    }
 }
 
 //parameters for categories
 if (isset ($_GET['visiblecat'])) {
-	block_students();
+    block_students();
 
-	if (isset ($_GET['set_visible'])) {
-		$visibility_command= 1;
-	} else {
-		$visibility_command= 0;
-	}
-	$cats= Category :: load($_GET['visiblecat']);
-	$cats[0]->set_visible($visibility_command);
-	$cats[0]->save();
-	$cats[0]->apply_visibility_to_children();
-	unset ($cats);
-	if ($visibility_command) {
-		$confirmation_message = get_lang('ViMod');
-		$filter_confirm_msg = false;
-	} else {
-		$confirmation_message = get_lang('InViMod');
-		$filter_confirm_msg = false;
-	}
+    if (isset ($_GET['set_visible'])) {
+        $visibility_command= 1;
+    } else {
+        $visibility_command= 0;
+    }
+    $cats= Category :: load($_GET['visiblecat']);
+    $cats[0]->set_visible($visibility_command);
+    $cats[0]->save();
+    $cats[0]->apply_visibility_to_children();
+    unset ($cats);
+    if ($visibility_command) {
+        $confirmation_message = get_lang('ViMod');
+        $filter_confirm_msg = false;
+    } else {
+        $confirmation_message = get_lang('InViMod');
+        $filter_confirm_msg = false;
+    }
 }
 if (isset($_GET['deletecat'])) {
-	block_students();
-	$cats = Category :: load($_GET['deletecat']);
+    block_students();
+    $cats = Category :: load($_GET['deletecat']);
     if (isset($cats[0])) {
         //delete all categories,subcategories and results
         if ($cats[0] != null) {
             if ($cats[0]->get_id() != 0) {
-                 // better don't try to delete the root...
-                 $cats[0]->delete_all();
+                // better don't try to delete the root...
+                $cats[0]->delete_all();
             }
         }
     }
-	$confirmation_message = get_lang('CategoryDeleted');
-	$filter_confirm_msg = false;
+    $confirmation_message = get_lang('CategoryDeleted');
+    $filter_confirm_msg = false;
 }
 //parameters for evaluations
 if (isset ($_GET['visibleeval'])) {
-	block_students();
-	if (isset ($_GET['set_visible'])) {
-		$visibility_command= 1;
-	} else {
-		$visibility_command= 0;
-	}
-	$eval= Evaluation :: load($_GET['visibleeval']);
-	$eval[0]->set_visible($visibility_command);
-	$eval[0]->save();
-	unset ($eval);
-	if ($visibility_command) {
-		$confirmation_message = get_lang('ViMod');
-		$filter_confirm_msg = false;
-	} else {
-		$confirmation_message = get_lang('InViMod');
-		$filter_confirm_msg = false;
-	}
+    block_students();
+    if (isset ($_GET['set_visible'])) {
+        $visibility_command= 1;
+    } else {
+        $visibility_command= 0;
+    }
+    $eval= Evaluation :: load($_GET['visibleeval']);
+    $eval[0]->set_visible($visibility_command);
+    $eval[0]->save();
+    unset ($eval);
+    if ($visibility_command) {
+        $confirmation_message = get_lang('ViMod');
+        $filter_confirm_msg = false;
+    } else {
+        $confirmation_message = get_lang('InViMod');
+        $filter_confirm_msg = false;
+    }
 }
 //parameters for evaluations
 if (isset($_GET['lockedeval'])) {
-	block_students();
-	$locked = Security::remove_XSS($_GET['lockedeval']);
-	if (isset($_GET['typelocked']) && api_is_platform_admin()){
-		$type_locked = 0;
-		$confirmation_message = get_lang('EvaluationHasBeenUnLocked');
-	} else {
-		$type_locked = 1;
-		$confirmation_message = get_lang('EvaluationHasBeenLocked');
-	}
-	$eval = Evaluation :: load($locked);
-	if ($eval[0] != null) {
-		$eval[0]->lock($type_locked);
-	}
+    block_students();
+    $locked = Security::remove_XSS($_GET['lockedeval']);
+    if (isset($_GET['typelocked']) && api_is_platform_admin()){
+        $type_locked = 0;
+        $confirmation_message = get_lang('EvaluationHasBeenUnLocked');
+    } else {
+        $type_locked = 1;
+        $confirmation_message = get_lang('EvaluationHasBeenLocked');
+    }
+    $eval = Evaluation :: load($locked);
+    if ($eval[0] != null) {
+        $eval[0]->lock($type_locked);
+    }
 
-	$filter_confirm_msg = false;
+    $filter_confirm_msg = false;
 
 }
 if (isset ($_GET['deleteeval'])) {
-	block_students();
-	$eval= Evaluation :: load($_GET['deleteeval']);
-	if ($eval[0] != null) {
-		$eval[0]->delete_with_results();
-	}
-	$confirmation_message = get_lang('GradebookEvaluationDeleted');
-	$filter_confirm_msg = false;
+    block_students();
+    $eval= Evaluation :: load($_GET['deleteeval']);
+    if ($eval[0] != null) {
+        $eval[0]->delete_with_results();
+    }
+    $confirmation_message = get_lang('GradebookEvaluationDeleted');
+    $filter_confirm_msg = false;
 }
 //parameters for links
 if (isset ($_GET['visiblelink'])) {
-	block_students();
-	if (isset ($_GET['set_visible'])) {
-		$visibility_command= 1;
-	} else {
-		$visibility_command= 0;
-	}
-	$link= LinkFactory :: load($_GET['visiblelink']);
-	if (isset($link) && isset($link[0])) {
-		$link[0]->set_visible($visibility_command);
-		$link[0]->save();
-	}
-	unset ($link);
-	if ($visibility_command) {
-		$confirmation_message = get_lang('ViMod');
-		$filter_confirm_msg = false;
-	} else {
-		$confirmation_message = get_lang('InViMod');
-		$filter_confirm_msg = false;
-	}
+    block_students();
+    if (isset ($_GET['set_visible'])) {
+        $visibility_command= 1;
+    } else {
+        $visibility_command= 0;
+    }
+    $link= LinkFactory :: load($_GET['visiblelink']);
+    if (isset($link) && isset($link[0])) {
+        $link[0]->set_visible($visibility_command);
+        $link[0]->save();
+    }
+    unset ($link);
+    if ($visibility_command) {
+        $confirmation_message = get_lang('ViMod');
+        $filter_confirm_msg = false;
+    } else {
+        $confirmation_message = get_lang('InViMod');
+        $filter_confirm_msg = false;
+    }
 }
 
 $course_id = api_get_course_int_id();
 
 if (isset ($_GET['deletelink'])) {
-	block_students();
-	$get_delete_link = intval($_GET['deletelink']);
-	//fixing #5229
-	if (!empty($get_delete_link)) {
-		$link= LinkFactory :: load($get_delete_link);
-		if ($link[0] != null) {
-			// clean forum qualify
-			$sql = 'UPDATE '.$tbl_forum_thread.' SET thread_qualify_max=0,thread_weight=0,thread_title_qualify=""
-					WHERE c_id = '.$course_id.' AND thread_id = (SELECT ref_id FROM '.$tbl_grade_links.' WHERE id='.$get_delete_link.' AND type = '.LINK_FORUM_THREAD.');';
-			Database::query($sql);
-			// clean attendance
-			$sql = 'UPDATE '.$tbl_attendance.' SET attendance_qualify_max=0, attendance_weight = 0, attendance_qualify_title=""
-				 	WHERE c_id = '.$course_id.' AND id = (SELECT ref_id FROM '.$tbl_grade_links.' WHERE id='.$get_delete_link.' AND type = '.LINK_ATTENDANCE.');';
-			Database::query($sql);
-			$link[0]->delete();
-		}
-		unset ($link);
-		$confirmation_message = get_lang('LinkDeleted');
-		$filter_confirm_msg = false;
-	}
+    block_students();
+    $get_delete_link = intval($_GET['deletelink']);
+    //fixing #5229
+    if (!empty($get_delete_link)) {
+        $link= LinkFactory :: load($get_delete_link);
+        if ($link[0] != null) {
+            // clean forum qualify
+            $sql = 'UPDATE '.$tbl_forum_thread.' SET thread_qualify_max=0,thread_weight=0,thread_title_qualify=""
+					WHERE c_id = '.$course_id.' AND thread_id = (
+					    SELECT ref_id FROM '.$tbl_grade_links.'
+					    WHERE id='.$get_delete_link.' AND type = '.LINK_FORUM_THREAD.'
+                    )';
+            Database::query($sql);
+            // clean attendance
+            $sql = 'UPDATE '.$tbl_attendance.' SET attendance_qualify_max=0, attendance_weight = 0, attendance_qualify_title=""
+				 	WHERE c_id = '.$course_id.' AND id = (
+				 	    SELECT ref_id FROM '.$tbl_grade_links.'
+				 	    WHERE id='.$get_delete_link.' AND type = '.LINK_ATTENDANCE.'
+                    )';
+            Database::query($sql);
+            $link[0]->delete();
+        }
+        unset ($link);
+        $confirmation_message = get_lang('LinkDeleted');
+        $filter_confirm_msg = false;
+    }
 }
 
 if (!empty($course_to_crsind) && !isset($_GET['confirm'])) {
-	block_students();
+    block_students();
 
-	if (!isset($_GET['movecat']) && !isset($_GET['moveeval'])) {
-		die ('Error: movecat or moveeval not defined');
-	}
-	$button = '<form name="confirm" method="post" action="'.api_get_self() .'?confirm='
-					.(isset($_GET['movecat']) ? '&movecat=' . Security::remove_XSS($_GET['movecat'])
-					: '&moveeval=' . Security::remove_XSS($_GET['moveeval']) )
-					.'&selectcat=' . Security::remove_XSS($_GET['selectcat'])
-					.'&targetcat=' . Security::remove_XSS($_GET['targetcat']).'">
+    if (!isset($_GET['movecat']) && !isset($_GET['moveeval'])) {
+        die ('Error: movecat or moveeval not defined');
+    }
+    $button = '<form name="confirm" method="post" action="'.api_get_self() .'?confirm='
+        .(isset($_GET['movecat']) ? '&movecat=' . Security::remove_XSS($_GET['movecat'])
+            : '&moveeval=' . Security::remove_XSS($_GET['moveeval']) )
+        .'&selectcat=' . Security::remove_XSS($_GET['selectcat'])
+        .'&targetcat=' . Security::remove_XSS($_GET['targetcat']).'">
 			   <input type="submit" value="'.get_lang('Ok').'">
 			   </form>';
-	$warning_message = get_lang('MoveWarning').'<br><br>'.$button;
-	$filter_warning_msg = false;
+    $warning_message = get_lang('MoveWarning').'<br><br>'.$button;
+    $filter_warning_msg = false;
 }
 
 $action = isset($_GET['action']) ? $_GET['action'] : null;
@@ -439,164 +450,164 @@ switch ($action) {
 
 //actions on the sortabletable
 if (isset ($_POST['action'])) {
-	block_students();
-	$number_of_selected_items= count($_POST['id']);
+    block_students();
+    $number_of_selected_items= count($_POST['id']);
 
-	if ($number_of_selected_items == '0') {
-		$warning_message = get_lang('NoItemsSelected');
-		$filter_warning_msg = false;
-	} else {
-		switch ($_POST['action']) {
-
-			case 'deleted' :
-				$number_of_deleted_categories= 0;
-				$number_of_deleted_evaluations= 0;
-				$number_of_deleted_links= 0;
-				foreach ($_POST['id'] as $indexstr) {
-					if (substr($indexstr, 0, 4) == 'CATE') {
-						$cats= Category :: load(substr($indexstr, 4));
-						if ($cats[0] != null) {
-							$cats[0]->delete_all();
-						}
-						$number_of_deleted_categories++;
-					}
-					if (substr($indexstr, 0, 4) == 'EVAL') {
-						$eval= Evaluation :: load(substr($indexstr, 4));
-						if ($eval[0] != null) {
-							$eval[0]->delete_with_results();
-						}
-
-						$number_of_deleted_evaluations++;
-					}
-					if (substr($indexstr, 0, 4) == 'LINK') {
-						//fixing #5229
-						$id = substr($indexstr, 4);
-						if (!empty($id)) {
-							$link= LinkFactory :: load($id);
-							if ($link[0] != null) {
-								$link[0]->delete();
-							}
-							$number_of_deleted_links++;
-						}
-					}
-				}
-				$confirmation_message = get_lang('DeletedCategories') . ' : <b>' . $number_of_deleted_categories . '</b><br />' . get_lang('DeletedEvaluations') . ' : <b>' . $number_of_deleted_evaluations . '</b><br />' . get_lang('DeletedLinks') . ' : <b>' . $number_of_deleted_links . '</b><br /><br />' . get_lang('TotalItems') . ' : <b>' . $number_of_selected_items . '</b>';
-				$filter_confirm_msg = false;
-				break;
-			case 'setvisible' :
-				foreach ($_POST['id'] as $indexstr) {
-					if (substr($indexstr, 0, 4) == 'CATE') {
-						$cats= Category :: load(substr($indexstr, 4));
-						$cats[0]->set_visible(1);
-						$cats[0]->save();
-						$cats[0]->apply_visibility_to_children();
-					}
-					if (substr($indexstr, 0, 4) == 'EVAL') {
-						$eval= Evaluation :: load(substr($indexstr, 4));
-						$eval[0]->set_visible(1);
-						$eval[0]->save();
-					}
-					if (substr($indexstr, 0, 4) == 'LINK') {
-						$link= LinkFactory :: load(substr($indexstr, 4));
-						$link[0]->set_visible(1);
-						$link[0]->save();
-					}
-				}
-				$confirmation_message = get_lang('ItemsVisible');
-				$filter_confirm_msg = false;
-				break;
-			case 'setinvisible' :
-				foreach ($_POST['id'] as $indexstr) {
-					if (substr($indexstr, 0, 4) == 'CATE') {
-						$cats= Category :: load(substr($indexstr, 4));
-						$cats[0]->set_visible(0);
-						$cats[0]->save();
-						$cats[0]->apply_visibility_to_children();
-					}
-					if (substr($indexstr, 0, 4) == 'EVAL') {
-						$eval= Evaluation :: load(substr($indexstr, 4));
-						$eval[0]->set_visible(0);
-						$eval[0]->save();
-					}
-					if (substr($indexstr, 0, 4) == 'LINK') {
-						$link= LinkFactory :: load(substr($indexstr, 4));
-						$link[0]->set_visible(0);
-						$link[0]->save();
-					}
-				}
-				$confirmation_message = get_lang('ItemsInVisible');
-				$filter_confirm_msg = false;
-				break;
-		}
-	}
+    if ($number_of_selected_items == '0') {
+        $warning_message = get_lang('NoItemsSelected');
+        $filter_warning_msg = false;
+    } else {
+        switch ($_POST['action']) {
+
+            case 'deleted' :
+                $number_of_deleted_categories= 0;
+                $number_of_deleted_evaluations= 0;
+                $number_of_deleted_links= 0;
+                foreach ($_POST['id'] as $indexstr) {
+                    if (substr($indexstr, 0, 4) == 'CATE') {
+                        $cats= Category :: load(substr($indexstr, 4));
+                        if ($cats[0] != null) {
+                            $cats[0]->delete_all();
+                        }
+                        $number_of_deleted_categories++;
+                    }
+                    if (substr($indexstr, 0, 4) == 'EVAL') {
+                        $eval= Evaluation :: load(substr($indexstr, 4));
+                        if ($eval[0] != null) {
+                            $eval[0]->delete_with_results();
+                        }
+
+                        $number_of_deleted_evaluations++;
+                    }
+                    if (substr($indexstr, 0, 4) == 'LINK') {
+                        //fixing #5229
+                        $id = substr($indexstr, 4);
+                        if (!empty($id)) {
+                            $link= LinkFactory :: load($id);
+                            if ($link[0] != null) {
+                                $link[0]->delete();
+                            }
+                            $number_of_deleted_links++;
+                        }
+                    }
+                }
+                $confirmation_message = get_lang('DeletedCategories') . ' : <b>' . $number_of_deleted_categories . '</b><br />' . get_lang('DeletedEvaluations') . ' : <b>' . $number_of_deleted_evaluations . '</b><br />' . get_lang('DeletedLinks') . ' : <b>' . $number_of_deleted_links . '</b><br /><br />' . get_lang('TotalItems') . ' : <b>' . $number_of_selected_items . '</b>';
+                $filter_confirm_msg = false;
+                break;
+            case 'setvisible' :
+                foreach ($_POST['id'] as $indexstr) {
+                    if (substr($indexstr, 0, 4) == 'CATE') {
+                        $cats= Category :: load(substr($indexstr, 4));
+                        $cats[0]->set_visible(1);
+                        $cats[0]->save();
+                        $cats[0]->apply_visibility_to_children();
+                    }
+                    if (substr($indexstr, 0, 4) == 'EVAL') {
+                        $eval= Evaluation :: load(substr($indexstr, 4));
+                        $eval[0]->set_visible(1);
+                        $eval[0]->save();
+                    }
+                    if (substr($indexstr, 0, 4) == 'LINK') {
+                        $link= LinkFactory :: load(substr($indexstr, 4));
+                        $link[0]->set_visible(1);
+                        $link[0]->save();
+                    }
+                }
+                $confirmation_message = get_lang('ItemsVisible');
+                $filter_confirm_msg = false;
+                break;
+            case 'setinvisible' :
+                foreach ($_POST['id'] as $indexstr) {
+                    if (substr($indexstr, 0, 4) == 'CATE') {
+                        $cats= Category :: load(substr($indexstr, 4));
+                        $cats[0]->set_visible(0);
+                        $cats[0]->save();
+                        $cats[0]->apply_visibility_to_children();
+                    }
+                    if (substr($indexstr, 0, 4) == 'EVAL') {
+                        $eval= Evaluation :: load(substr($indexstr, 4));
+                        $eval[0]->set_visible(0);
+                        $eval[0]->save();
+                    }
+                    if (substr($indexstr, 0, 4) == 'LINK') {
+                        $link= LinkFactory :: load(substr($indexstr, 4));
+                        $link[0]->set_visible(0);
+                        $link[0]->save();
+                    }
+                }
+                $confirmation_message = get_lang('ItemsInVisible');
+                $filter_confirm_msg = false;
+                break;
+        }
+    }
 }
 
 if (isset ($_POST['submit']) && isset ($_POST['keyword'])) {
-	header('Location: ' . api_get_self() . '?selectcat=' . Security::remove_XSS($_GET['selectcat'])
-	. '&search='.Security::remove_XSS($_POST['keyword']));
-	exit;
+    header('Location: ' . api_get_self() . '?selectcat=' . Security::remove_XSS($_GET['selectcat'])
+        . '&search='.Security::remove_XSS($_POST['keyword']));
+    exit;
 }
 
 // DISPLAY HEADERS AND MESSAGES
 if (!isset($_GET['exportpdf'])) {
-	if (isset ($_GET['studentoverview'])) {
-		$interbreadcrumb[]= array ('url' => $_SESSION['gradebook_dest'].'?selectcat=' . Security::remove_XSS($_GET['selectcat']),'name' => get_lang('ToolGradebook'));
-		Display :: display_header(get_lang('FlatView'));
-	} elseif (isset ($_GET['search'])) {
-		$interbreadcrumb[]= array ('url' => $_SESSION['gradebook_dest'].'?selectcat=' . Security::remove_XSS($_GET['selectcat']),'name' => get_lang('ToolGradebook'));
-		Display :: display_header(get_lang('SearchResults'));
-	} elseif(isset ($_GET['selectcat'])) {
-		$interbreadcrumb[]= array (	'url' =>'#','name' => get_lang('ToolGradebook'));
-		if (!isset($_GET['gradebooklist_direction'])) {
-			//$interbreadcrumb[]= array ('url' => $_SESSION['gradebook_dest'].'?selectcat=' . Security::remove_XSS($_GET['selectcat']),'name' => get_lang('Details'));
-		}
-		Display :: display_header('');
-	} else {
-		Display :: display_header(get_lang('ToolGradebook'));
-	}
+    if (isset ($_GET['studentoverview'])) {
+        $interbreadcrumb[]= array ('url' => $_SESSION['gradebook_dest'].'?selectcat=' . Security::remove_XSS($_GET['selectcat']),'name' => get_lang('ToolGradebook'));
+        Display :: display_header(get_lang('FlatView'));
+    } elseif (isset ($_GET['search'])) {
+        $interbreadcrumb[]= array ('url' => $_SESSION['gradebook_dest'].'?selectcat=' . Security::remove_XSS($_GET['selectcat']),'name' => get_lang('ToolGradebook'));
+        Display :: display_header(get_lang('SearchResults'));
+    } elseif(isset ($_GET['selectcat'])) {
+        $interbreadcrumb[]= array (	'url' =>'#','name' => get_lang('ToolGradebook'));
+        if (!isset($_GET['gradebooklist_direction'])) {
+            //$interbreadcrumb[]= array ('url' => $_SESSION['gradebook_dest'].'?selectcat=' . Security::remove_XSS($_GET['selectcat']),'name' => get_lang('Details'));
+        }
+        Display :: display_header('');
+    } else {
+        Display :: display_header(get_lang('ToolGradebook'));
+    }
 }
 
 if (isset ($_GET['categorymoved'])) {
-	Display :: display_confirmation_message(get_lang('CategoryMoved'),false);
+    Display :: display_confirmation_message(get_lang('CategoryMoved'),false);
 }
 if (isset ($_GET['evaluationmoved'])) {
-	Display :: display_confirmation_message(get_lang('EvaluationMoved'),false);
+    Display :: display_confirmation_message(get_lang('EvaluationMoved'),false);
 }
 if (isset ($_GET['linkmoved'])) {
-	Display :: display_confirmation_message(get_lang('LinkMoved'),false);
+    Display :: display_confirmation_message(get_lang('LinkMoved'),false);
 }
 if (isset ($_GET['addcat'])) {
-	Display :: display_confirmation_message(get_lang('CategoryAdded'),false);
+    Display :: display_confirmation_message(get_lang('CategoryAdded'),false);
 }
 if (isset ($_GET['linkadded'])) {
-	Display :: display_confirmation_message(get_lang('LinkAdded'),false);
+    Display :: display_confirmation_message(get_lang('LinkAdded'),false);
 }
 if (isset ($_GET['addresult'])) {
-	Display :: display_confirmation_message(get_lang('ResultAdded'),false);
+    Display :: display_confirmation_message(get_lang('ResultAdded'),false);
 }
 if (isset ($_GET['editcat'])) {
-	Display :: display_confirmation_message(get_lang('CategoryEdited'),false);
+    Display :: display_confirmation_message(get_lang('CategoryEdited'),false);
 }
 if (isset ($_GET['editeval'])) {
-	Display :: display_confirmation_message(get_lang('EvaluationEdited'),false);
+    Display :: display_confirmation_message(get_lang('EvaluationEdited'),false);
 }
 if (isset ($_GET['linkedited'])) {
-	Display :: display_confirmation_message(get_lang('LinkEdited'),false);
+    Display :: display_confirmation_message(get_lang('LinkEdited'),false);
 }
 if (isset ($_GET['nolinkitems'])){
-	Display :: display_warning_message(get_lang('NoLinkItems'),false);
+    Display :: display_warning_message(get_lang('NoLinkItems'),false);
 }
 if (isset ($_GET['addallcat'])){
-	Display :: display_normal_message(get_lang('AddAllCat'),false);
+    Display :: display_normal_message(get_lang('AddAllCat'),false);
 }
 if (isset ($confirmation_message)){
-	Display :: display_confirmation_message($confirmation_message,$filter_confirm_msg);
+    Display :: display_confirmation_message($confirmation_message,$filter_confirm_msg);
 }
 if (isset ($warning_message)){
-	Display :: display_warning_message($warning_message,$filter_warning_msg);
+    Display :: display_warning_message($warning_message,$filter_warning_msg);
 }
 if (isset ($move_form)){
-	Display :: display_normal_message($move_form->toHtml(),false);
+    Display :: display_normal_message($move_form->toHtml(),false);
 }
 
 // LOAD DATA & DISPLAY TABLE
@@ -606,38 +617,38 @@ $is_course_admin    = api_is_allowed_to_edit(null, true);
 
 //load data for category, evaluation and links
 if (empty ($_GET['selectcat'])) {
-	$category= 0;
+    $category= 0;
 } else {
-	$category= $_GET['selectcat'];
+    $category= $_GET['selectcat'];
 }
 $simple_search_form='';
 
 if (isset($_GET['studentoverview'])) {
     //@todo this code also seems to be deprecated ...
-	$cats= Category :: load($category);
-	$stud_id= (api_is_allowed_to_edit() ? null : $stud_id);
-	$allcat= array ();
-	$alleval= $cats[0]->get_evaluations($stud_id, true);
-	$alllink= $cats[0]->get_links($stud_id, true);
-	if (isset ($_GET['exportpdf'])) {
-		$datagen = new GradebookDataGenerator ($allcat,$alleval, $alllink);
-		$header_names = array(get_lang('Name'),get_lang('Description'),get_lang('Weight'),get_lang('Date'),get_lang('Results'));
-		$data_array = $datagen->get_data(GradebookDataGenerator :: GDG_SORT_NAME,0,null,true);
-		$newarray = array();
-		foreach ($data_array as $data) {
-			$newarray[] = array_slice($data, 1);
-		}
-		$pdf= new Cezpdf();
-		$pdf->selectFont(api_get_path(LIBRARY_PATH).'ezpdf/fonts/Courier.afm');
-		$pdf->ezSetMargins(30, 30, 50, 30);
-		$pdf->ezSetY(810);
-		$pdf->ezText(get_lang('FlatView').' ('. api_convert_and_format_date(null, DATE_FORMAT_SHORT). ' ' . api_convert_and_format_date(null, TIME_NO_SEC_FORMAT) .')',12,array('justification'=>'center'));
-		$pdf->line(50,790,550,790);
-		$pdf->line(50,40,550,40);
-		$pdf->ezSetY(750);
-		$pdf->ezTable($newarray,$header_names,'',array('showHeadings'=>1,'shaded'=>1,'showLines'=>1,'rowGap'=>3,'width'=> 500));
-		$pdf->ezStream();
-		exit;
+    $cats= Category :: load($category);
+    $stud_id= (api_is_allowed_to_edit() ? null : $stud_id);
+    $allcat= array ();
+    $alleval= $cats[0]->get_evaluations($stud_id, true);
+    $alllink= $cats[0]->get_links($stud_id, true);
+    if (isset ($_GET['exportpdf'])) {
+        $datagen = new GradebookDataGenerator ($allcat,$alleval, $alllink);
+        $header_names = array(get_lang('Name'),get_lang('Description'),get_lang('Weight'),get_lang('Date'),get_lang('Results'));
+        $data_array = $datagen->get_data(GradebookDataGenerator :: GDG_SORT_NAME,0,null,true);
+        $newarray = array();
+        foreach ($data_array as $data) {
+            $newarray[] = array_slice($data, 1);
+        }
+        $pdf= new Cezpdf();
+        $pdf->selectFont(api_get_path(LIBRARY_PATH).'ezpdf/fonts/Courier.afm');
+        $pdf->ezSetMargins(30, 30, 50, 30);
+        $pdf->ezSetY(810);
+        $pdf->ezText(get_lang('FlatView').' ('. api_convert_and_format_date(null, DATE_FORMAT_SHORT). ' ' . api_convert_and_format_date(null, TIME_NO_SEC_FORMAT) .')',12,array('justification'=>'center'));
+        $pdf->line(50,790,550,790);
+        $pdf->line(50,40,550,40);
+        $pdf->ezSetY(750);
+        $pdf->ezTable($newarray,$header_names,'',array('showHeadings'=>1,'shaded'=>1,'showLines'=>1,'rowGap'=>3,'width'=> 500));
+        $pdf->ezStream();
+        exit;
     }
 } else {
     //Student view
@@ -657,21 +668,21 @@ if (isset($_GET['studentoverview'])) {
         // When *inside* a course, we want to make sure there is one (and only
         // one) category for this course or for this session.
 
-		//hack for delete a gradebook from inside course
-		/*
-		$clean_deletecat = isset($_GET['deletecat']) ? intval($_GET['deletecat']) : null;
-		if (!empty($clean_deletecat)) {
-			exit;
-		}
-		//end hack*/
+        //hack for delete a gradebook from inside course
+        /*
+        $clean_deletecat = isset($_GET['deletecat']) ? intval($_GET['deletecat']) : null;
+        if (!empty($clean_deletecat)) {
+            exit;
+        }
+        //end hack*/
 
-	    $cats = Category :: load(null, null, $course_code, null, null, $session_id, false);
+        $cats = Category :: load(null, null, $course_code, null, null, $session_id, false);
         if (empty($cats)) {
             // There is no category for this course+session, so create one
             $cat= new Category();
             if (!empty($session_id)) {
                 $s_name = api_get_session_name($session_id);
-            	$cat->set_name($course_code.' - '.get_lang('Session').' '.$s_name);
+                $cat->set_name($course_code.' - '.get_lang('Session').' '.$s_name);
                 $cat->set_session_id($session_id);
             } else {
                 $cat->set_name($course_code);
@@ -697,12 +708,12 @@ if (isset($_GET['studentoverview'])) {
     if (api_is_platform_admin()) {
         $stud_id = (api_is_allowed_to_edit() ? null : api_get_user_id());
     } else {
-    	$stud_id = $stud_id;
+        $stud_id = $stud_id;
     }
 
-	$allcat  = $cats[0]->get_subcategories($stud_id, $course_code, $session_id);
-	$alleval = $cats[0]->get_evaluations($stud_id);
-	$alllink = $cats[0]->get_links($stud_id);
+    $allcat  = $cats[0]->get_subcategories($stud_id, $course_code, $session_id);
+    $alleval = $cats[0]->get_evaluations($stud_id);
+    $alllink = $cats[0]->get_links($stud_id);
     //whether we found a category or not, we now have a category object with
     // empty or full subcats
 }
@@ -711,13 +722,13 @@ if (isset($_GET['studentoverview'])) {
 $addparams = array ('selectcat' => $cats[0]->get_id());
 
 if (isset ($_GET['studentoverview'])) {
-	$addparams['studentoverview'] = '';
+    $addparams['studentoverview'] = '';
 }
 //$addparams['cidReq']='';
 if (isset($_GET['cidReq']) && $_GET['cidReq']!='') {
-	$addparams['cidReq']=Security::remove_XSS($_GET['cidReq']);
+    $addparams['cidReq']=Security::remove_XSS($_GET['cidReq']);
 } else {
-	$addparams['cidReq']='';
+    $addparams['cidReq']='';
 }
 
 $no_qualification = false;
@@ -725,44 +736,44 @@ $no_qualification = false;
 // Show certificate link.
 
 if ($category != '0') {
-	$cat = new Category();
-	$category_id   = intval($_GET['selectcat']);
-	$course_id     = Database::get_course_by_category($category_id);
-	$show_message  = $cat->show_message_resource_delete($course_id);
-
-	if ($show_message == '') {
-		// Student
-		if (!api_is_allowed_to_edit()) {
+    $cat = new Category();
+    $category_id   = intval($_GET['selectcat']);
+    $course_id     = Database::get_course_by_category($category_id);
+    $show_message  = $cat->show_message_resource_delete($course_id);
+
+    if ($show_message == '') {
+        // Student
+        if (!api_is_allowed_to_edit()) {
             $certificate_html = Category::register_user_certificate($category_id, $stud_id);
             if ($certificate_html) {
                 echo $certificate_html;
             }
-		}
-	}
+        }
+    }
 }
 
 if (api_is_allowed_to_edit(null, true)) {
-	// Tool introduction
-	Display::display_introduction_section(TOOL_GRADEBOOK, array('ToolbarSet' => 'AssessmentsIntroduction'));
+    // Tool introduction
+    Display::display_introduction_section(TOOL_GRADEBOOK, array('ToolbarSet' => 'AssessmentsIntroduction'));
 
-	if ( (isset ($_GET['selectcat']) && $_GET['selectcat']<>0)) {
-	//
-	} else {
+    if ( (isset ($_GET['selectcat']) && $_GET['selectcat']<>0)) {
+        //
+    } else {
         if (((isset ($_GET['selectcat']) && $_GET['selectcat']==0) || ((isset($_GET['cidReq']) && $_GET['cidReq']!==''))) || isset($_GET['isStudentView']) && $_GET['isStudentView']=='false') {
             $cats = Category :: load(null, null, $course_code, null, null, $session_id, false);
-		}
-	}
+        }
+    }
 }
 
 if (isset($first_time) && $first_time==1 && api_is_allowed_to_edit(null,true)) {
-	echo '<meta http-equiv="refresh" content="0;url='.api_get_self().'?cidReq='.$course_code.'" />';
+    echo '<meta http-equiv="refresh" content="0;url='.api_get_self().'?cidReq='.$course_code.'" />';
 } else {
     $cats = Category::load(null, null, $course_code, null, null, $session_id, false);
 
-	if (!empty($cats)) {
+    if (!empty($cats)) {
         if ((api_get_setting('gradebook_enable_grade_model') == 'true') &&
-             (api_is_platform_admin() || (api_is_allowed_to_edit(null, true) &&
-             api_get_setting('teachers_can_change_grade_model_settings') == 'true'))
+            (api_is_platform_admin() || (api_is_allowed_to_edit(null, true) &&
+                    api_get_setting('teachers_can_change_grade_model_settings') == 'true'))
         ) {
 
             // Getting grade models.
@@ -837,18 +848,18 @@ if (isset($first_time) && $first_time==1 && api_is_allowed_to_edit(null,true)) {
                     true
                 );
 
-				if (api_is_allowed_to_edit(null,true) &&
+                if (api_is_allowed_to_edit(null,true) &&
                     api_get_setting('gradebook_enable_grade_model') == 'true'
                 ) {
-					//Showing the grading system
-					if (!empty($grade_models[$grade_model_id])) {
+                    //Showing the grading system
+                    if (!empty($grade_models[$grade_model_id])) {
                         Display::display_normal_message(get_lang('GradeModel').': '.$grade_models[$grade_model_id]['name']);
                     }
-				}
-				$gradebooktable = new GradebookTable($cat, $allcat, $alleval, $alllink, $addparams);
-				$gradebooktable->display();
-			}
-		}
-	}
+                }
+                $gradebooktable = new GradebookTable($cat, $allcat, $alleval, $alllink, $addparams);
+                $gradebooktable->display();
+            }
+        }
+    }
 }
 Display :: display_footer();
diff --git a/main/gradebook/user_info.php b/main/gradebook/user_info.php
index f3bf066008..73160a4cc8 100755
--- a/main/gradebook/user_info.php
+++ b/main/gradebook/user_info.php
@@ -1,12 +1,10 @@
-<?php // $Id: $
+<?php
 /* For licensing terms, see /license.txt */
+
 /**
  * Script
  * @package chamilo.gradebook
  */
-/**
- * Init
- */
 $language_file = 'gradebook';
 //$cidReset = true;
 require_once '../inc/global.inc.php';
@@ -16,13 +14,13 @@ require_once api_get_path(LIBRARY_PATH) . 'import.lib.php';
 api_block_anonymous_users();
 
 if (isset($_GET['userid'])) {
-	$user_id = Security::remove_XSS($_GET['userid']);
-	$user = UserManager::get_user_info_by_id($user_id);
-	if (!$user) {
-		api_not_allowed();
-	}
+    $user_id = Security::remove_XSS($_GET['userid']);
+    $user = UserManager::get_user_info_by_id($user_id);
+    if (!$user) {
+        api_not_allowed();
+    }
 } else {
-	api_not_allowed();
+    api_not_allowed();
 }
 
 require_once 'lib/be.inc.php';
@@ -32,14 +30,14 @@ block_students();
 
 $form = new UserForm(UserForm :: TYPE_USER_INFO, $user, 'user_info_form', null, api_get_self() . '?userid=' . $user_id . '&selectcat=' . Security::remove_XSS($_GET['selectcat']));
 if ($form->validate()) {
-	header('Location: user_stats.php?selectcat=' . Security::remove_XSS($_GET['selectcat']).'&userid=' .$user_id);
-	exit;
+    header('Location: user_stats.php?selectcat=' . Security::remove_XSS($_GET['selectcat']).'&userid=' .$user_id);
+    exit;
 }
 
 $interbreadcrumb[] = array (
-	'url' => $_SESSION['gradebook_dest'],
-	'name' => get_lang('Gradebook'
-));
+    'url' => $_SESSION['gradebook_dest'],
+    'name' => get_lang('Gradebook'
+    ));
 Display :: display_header(get_lang('UserInfo'));
 
 //User picture size is calculated from SYSTEM path
@@ -50,12 +48,12 @@ $image_path = UserManager::get_user_picture_path_by_id($user_id,'web',false,true
 $image_file = $image_path['dir'].$image_path['file'];
 
 $img_attributes = 'src="'.$image_file.'?rand='.time().'" '
-	.'alt="'.api_get_person_name($user_data['firstname'], $user_data['lastname']).'" '
-	.'style="float:left; padding:5px;" ';
+    .'alt="'.api_get_person_name($user_data['firstname'], $user_data['lastname']).'" '
+    .'style="float:left; padding:5px;" ';
 
 if ($image_size[0] > 300) {
-	//limit display width to 300px
-	$img_attributes .= 'width="300" ';
+    //limit display width to 300px
+    $img_attributes .= 'width="300" ';
 }
 //@todo need a "makeup"
 echo '<img '.$img_attributes.'/>';
diff --git a/main/gradebook/user_stats.php b/main/gradebook/user_stats.php
index f9275247c4..7cdc9beda9 100755
--- a/main/gradebook/user_stats.php
+++ b/main/gradebook/user_stats.php
@@ -1,12 +1,10 @@
 <?php
 /* For licensing terms, see /license.txt */
+
 /**
  * Script
  * @package chamilo.gradebook
  */
-/**
- * Init
- */
 
 $language_file= 'gradebook';
 
@@ -23,8 +21,8 @@ api_block_anonymous_users();
 block_students();
 
 $interbreadcrumb[]= array (
-	'url' => $_SESSION['gradebook_dest'],
-	'name' => get_lang('Gradebook'
+    'url' => $_SESSION['gradebook_dest'],
+    'name' => get_lang('Gradebook'
 ));
 
 $category = Category :: load($_GET['selectcat']);
@@ -33,37 +31,37 @@ $allevals= $category[0]->get_evaluations($my_user_id, true);
 $alllinks= $category[0]->get_links($my_user_id, true);
 
 if ($_GET['selectcat'] != null) {
-	$addparams= array (
-		'userid' => $my_user_id,
-		'selectcat' => Security::remove_XSS($_GET['selectcat'])
-	);
+    $addparams= array (
+        'userid' => $my_user_id,
+        'selectcat' => Security::remove_XSS($_GET['selectcat'])
+    );
 } else {
-	$addparams= array (
-		'userid' => $my_user_id,
-		'selecteval' => Security::remove_XSS($_GET['selecteval'])
-	);
+    $addparams= array (
+        'userid' => $my_user_id,
+        'selecteval' => Security::remove_XSS($_GET['selecteval'])
+    );
 }
 
 $user_table= new UserTable($my_user_id, $allevals, $alllinks, $addparams);
 
 if (isset ($_GET['exportpdf'])) {
-	$datagen       = new UserDataGenerator($my_user_id, $allevals, $alllinks);
-	$data_array    = $datagen->get_data(UserDataGenerator :: UDG_SORT_NAME, 0, null, true);
-	$newarray      = array ();
-	$displayscore  = Scoredisplay :: instance();
-	foreach ($data_array as $data) {
+    $datagen       = new UserDataGenerator($my_user_id, $allevals, $alllinks);
+    $data_array    = $datagen->get_data(UserDataGenerator :: UDG_SORT_NAME, 0, null, true);
+    $newarray      = array ();
+    $displayscore  = Scoredisplay :: instance();
+    foreach ($data_array as $data) {
         $newarray[] = array_slice($data, 1);
-	}
-	$userinfo = get_user_info_from_id($my_user_id);
-	$html .= get_lang('Results').' : '.api_get_person_name($userinfo['firstname'], $userinfo['lastname']).' ('. api_convert_and_format_date(null, DATE_FORMAT_SHORT). ' ' . api_convert_and_format_date(null, TIME_NO_SEC_FORMAT) .')';
+    }
+    $userinfo = get_user_info_from_id($my_user_id);
+    $html .= get_lang('Results').' : '.api_get_person_name($userinfo['firstname'], $userinfo['lastname']).' ('. api_convert_and_format_date(null, DATE_FORMAT_SHORT). ' ' . api_convert_and_format_date(null, TIME_NO_SEC_FORMAT) .')';
 
-	if ($displayscore->is_custom()) {
-		$header_names= array (
+    if ($displayscore->is_custom()) {
+        $header_names= array (
             get_lang('Evaluation'), get_lang('Course'), get_lang('Category'), get_lang('EvaluationAverage'),get_lang('Result'),get_lang('Display'));
-	} else {
-		$header_names= array (
-			get_lang('Evaluation'), get_lang('Course'), get_lang('Category'), get_lang('EvaluationAverage'),get_lang('Result'));
-	}
+    } else {
+        $header_names= array (
+            get_lang('Evaluation'), get_lang('Course'), get_lang('Category'), get_lang('EvaluationAverage'),get_lang('Result'));
+    }
 
     $table = new HTML_Table(array('class' => 'data_table'));
     $row = 0;
@@ -87,21 +85,21 @@ if (isset ($_GET['exportpdf'])) {
     require_once api_get_path(LIBRARY_PATH).'pdf.lib.php';
     $pdf = new PDF();
     $pdf->content_to_pdf($html);
-	exit;
+    exit;
 }
 $actions = '<div class="actions">';
 
 if (isset($_GET['selectcat'])) {
-	$interbreadcrumb[]= array ('url' => 'gradebook_flatview.php?selectcat=' . Security::remove_XSS($_GET['selectcat']), 'name' => get_lang('FlatView'));
-	$actions.= '<a href=gradebook_flatview.php?selectcat=' .Security::remove_XSS($_GET['selectcat']) . '>' . Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('FlatView'),'',ICON_SIZE_MEDIUM).'</a>';
+    $interbreadcrumb[]= array ('url' => 'gradebook_flatview.php?selectcat=' . Security::remove_XSS($_GET['selectcat']), 'name' => get_lang('FlatView'));
+    $actions.= '<a href=gradebook_flatview.php?selectcat=' .Security::remove_XSS($_GET['selectcat']) . '>' . Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('FlatView'),'',ICON_SIZE_MEDIUM).'</a>';
 }
 
 if (isset ($_GET['selecteval'])) {
-	$interbreadcrumb[]= array (
-		'url' => 'gradebook_view_result.php?selecteval=' . Security::remove_XSS($_GET['selecteval']),
-		'name' => get_lang('ViewResult'
-	));
-	$actions.= '<a href=gradebook_view_result.php?selecteval=' . Security::remove_XSS($_GET['selecteval']) . '>
+    $interbreadcrumb[]= array (
+        'url' => 'gradebook_view_result.php?selecteval=' . Security::remove_XSS($_GET['selecteval']),
+        'name' => get_lang('ViewResult'
+    ));
+    $actions.= '<a href=gradebook_view_result.php?selecteval=' . Security::remove_XSS($_GET['selecteval']) . '>
 	'.Display::return_icon('back.png', get_lang('BackToEvaluation'),'',ICON_SIZE_MEDIUM).'</a>';
 }