diff --git a/main/forum/forumbody.inc.php b/main/forum/forumbody.inc.php
index 11c7cc9686..a25673c27b 100644
--- a/main/forum/forumbody.inc.php
+++ b/main/forum/forumbody.inc.php
@@ -5,6 +5,7 @@ $my_cid_req		 	= Security::remove_XSS($_GET['cidReq']);
 $my_forum 			= Security::remove_XSS($_GET['forum']);
 $my_thread 			= Security::remove_XSS($_GET['thread']);
 $my_user_id 		= Security::remove_XSS($_GET['user_id']);
+$user		 		= Security::remove_XSS($_GET['user']);
 $my_idtextqualify   = isset($_REQUEST['idtextqualify']) ? Security::remove_XSS($_REQUEST['idtextqualify']) : $qualify;
 $my_gradebook		= Security::remove_XSS($_GET['gradebook']);
 $to_origin				= Security::remove_XSS($_GET['origin']);
@@ -16,30 +17,58 @@ $output = <<<FIN
  		<input type="hidden" name="cidReq" value="{$my_cid_req}">
  		<input type="hidden" name="forum" value="{$my_forum}">
  		<input type="hidden" name="thread" value="{$my_thread}">
+ 		<input type="hidden" name="user" value="{$user}">
  		<input type="hidden" name="user_id" value="{$my_user_id}">
  		<input type="hidden" name="gradebook" value="{$my_gradebook}">
   		<input type="hidden" name="origin" value="{$to_origin}">
     	<tr>
 FIN;
+
 $output .= '
-			<td width="10%" class="forum-thread-header">'.get_lang('User').'&nbsp;:</td >
-        	<td width="90%" class="forum-thread-body"><div align="left">'.get_name_user_by_id($userid).'</div></td>
+			<td width="40%" class="forum-thread-header">'.get_lang('User').'&nbsp;:</td >
+        	<td width="60%" class="forum-thread-body"><div align="left">'.get_name_user_by_id($userid).'</div></td>
         </tr>
         <tr>
-    		<td width="10%" class="forum-thread-header">'.get_lang('Thread').'&nbsp;:</td >
-            <td  width="90%" class="forum-thread-body">
+    		<td width="40%" class="forum-thread-header">'.get_lang('Thread').'&nbsp;:</td >
+            <td  width="60%" class="forum-thread-body">
                 <div align="left">'.$current_thread['thread_title'].'</div>
             </td>
         </tr>
+
+       	<tr>
+    		<td width="40%" class="forum-thread-header">'.get_lang('CourseUsers').'&nbsp;:</td >
+            <td  width="60%" class="forum-thread-body">
+                <div align="left">'.$result['user_course'].'</div>
+            </td>
+        </tr>
+
+		<tr>
+    		<td width="40%" class="forum-thread-header">'.get_lang('PostsNumber').'&nbsp;:</td >
+            <td  width="60%" class="forum-thread-body">
+                <div align="left">'.$result['post'].'</div>
+            </td>
+        </tr>
+                <tr>
+    		<td width="40%" class="forum-thread-header">'.get_lang('NumberOfPostsForThisUser').'&nbsp;:</td >
+            <td  width="60%" class="forum-thread-body">
+                <div align="left">'.$result['user_post'].'</div>
+            </td>
+        </tr>
+                <tr>
+    		<td width="40%" class="forum-thread-header">'.get_lang('AveragePostPerUser').'&nbsp;:</td >
+            <td  width="60%" class="forum-thread-body">
+                <div align="left">'.round($result['user_post']/$result['post'],2).'</div>
+            </td>
+        </tr>
         <tr>
-            <td width="10%" class="forum-thread-header"><div align="left">'.get_lang('Qualification').'&nbsp;:</div></td >
-            <td  width="90%" class="forum-thread-body"><div align="left">
+            <td width="40%" class="forum-thread-header"><div align="left">'.get_lang('Qualification').'&nbsp;:</div></td >
+            <td  width="60%" class="forum-thread-body"><div align="left">
             	<input type="text" maxlength="4" id="idtextqualify" style="width:40px;" name="idtextqualify" value="'.$my_idtextqualify.'" />&nbsp;&nbsp;'.get_lang('MaxScore').'&nbsp;: '.$max_qualify.'</div>
             </td>
         </tr>
     	<tr>
-            <td width="10%"></td>
-            <td width="90%"><div align="left"><input type="button" id="idbutton_qualify" name="idbutton_qualify"  value="'.get_lang('QualifyThisThread').'" onclick="javascript:if(document.getElementById(\'idtextqualify\').value>=0){if(confirm(\''.get_lang('ConfirmUserQualification').'\')){document.getElementById(\'forum-thread-qualify\').submit();}else{return false;};}else{alert(\''.get_lang('InsertQualificationCorrespondingToMaxScore').'\')};" /></div></td>
+            <td width="40%"></td>
+            <td width="60%"><div align="left"><input type="button" id="idbutton_qualify" name="idbutton_qualify"  value="'.get_lang('QualifyThisThread').'" onclick="javascript:if(document.getElementById(\'idtextqualify\').value>=0){if(confirm(\''.get_lang('ConfirmUserQualification').'\')){document.getElementById(\'forum-thread-qualify\').submit();}else{return false;};}else{alert(\''.get_lang('InsertQualificationCorrespondingToMaxScore').'\')};" /></div></td>
         </tr>
         </form>
     </table>
diff --git a/main/forum/forumfunction.inc.php b/main/forum/forumfunction.inc.php
index 296a1a3cba..af094686e3 100644
--- a/main/forum/forumfunction.inc.php
+++ b/main/forum/forumfunction.inc.php
@@ -1875,7 +1875,7 @@ function show_add_post_form($action='', $id='', $form_values='') {
 
 		$form->addElement('static','Group','<a href="javascript://" onclick="if(document.getElementById(\'id_qualify\').style.display==\'none\'){ document.getElementById(\'id_qualify\').style.display=\'block\'; } else { document.getElementById(\'id_qualify\').style.display=\'none\'; }" ><br /><img src="../img/nolines_plus.gif" alt="" />'.get_lang('AdvancedParameters').'</a>');
 		$form->addElement('html','<div id="id_qualify" style="display:none">');
-		$form->addElement('static','Group', '<br /><strong>'.get_lang('QualifyThread').'</strong>');
+		$form->addElement('static','Group', '<br /><strong>'.get_lang('AlterQualifyThread').'</strong>');
 		$form->addElement('checkbox', 'thread_qualify_gradebook', '', get_lang('QualifyThreadGradebook'));
 		$form->addElement('text', 'calification_notebook_title', get_lang('TitleColumnGradebook'));
 		$form->addElement('text', 'weight_calification', get_lang('QualifyWeight'),'Style="width:40px"');
@@ -1933,7 +1933,10 @@ function show_add_post_form($action='', $id='', $form_values='') {
 		$form->display();
 		echo '<br />';
 		if ($forum_setting['show_thread_iframe_on_reply'] and $action<>'newthread') {
-			echo "<iframe src=\"iframe_thread.php?forum=".Security::remove_XSS($my_forum)."&amp;thread=".Security::remove_XSS($my_thread)."#".Security::remove_XSS($my_post)."\" width=\"80%\"></iframe>";
+
+				echo "<iframe src=\"iframe_thread.php?forum=".Security::remove_XSS($my_forum)."&amp;thread=".Security::remove_XSS($my_thread)."#".Security::remove_XSS($my_post)."\" width=\"80%\"></iframe>";
+
+			
 		}
 	}
 }
diff --git a/main/forum/forumqualify.php b/main/forum/forumqualify.php
index ef56ecf693..50189b611f 100644
--- a/main/forum/forumqualify.php
+++ b/main/forum/forumqualify.php
@@ -1,138 +1,310 @@
-<?php
-/*
-==============================================================================
-	Dokeos - elearning and course management software
-
-	Copyright (c) 2008 Dokeos Latinoamerica SAC
-
-	For a full list of contributors, see "credits.txt".
-	The full license can be read in "license.txt".
-
-	This program is free software; you can redistribute it and/or
-	modify it under the terms of the GNU General Public License
-	as published by the Free Software Foundation; either version 2
-	of the License, or (at your option) any later version.
-
-	See the GNU General Public License for more details.
-
-	Contact address: Dokeos, 108, ru du Corbeau, B-1030 Brussels, Belgium
-	Mail: info@dokeos.com
-==============================================================================
-*/
-/**
-* 	@package dokeos.forum
-*/
-$language_file=array('admin','forum');
-require '../inc/global.inc.php';
-require 'forumconfig.inc.php';
-require_once 'forumfunction.inc.php';
-$nameTools = get_lang('Forum');
-$this_section = SECTION_COURSES;
-
-$origin = '';
-$origin_string='';
-if (isset($_GET['origin'])) {
-	$origin =  Security::remove_XSS($_GET['origin']);
-}
-
-
-$current_thread=get_thread_information($_GET['thread']); // note: this has to be validated that it is an existing thread
-$current_forum=get_forum_information($current_thread['forum_id']); // note: this has to be validated that it is an existing forum.
-$current_forum_category=get_forumcategory_information($current_forum['forum_category']);
-$whatsnew_post_info=$_SESSION['whatsnew_post_info'];
-$interbreadcrumb[]=array("url" => "index.php?search=".Security::remove_XSS(urlencode($_GET['search'])),"name" => $nameTools);
-$interbreadcrumb[]=array("url" => "viewforumcategory.php?forumcategory=".$current_forum_category['cat_id']."&amp;search=".Security::remove_XSS(urlencode($_GET['search'])),"name" => prepare4display($current_forum_category['cat_title']));
-
-if (isset($_GET['gradebook']) && $_GET['gradebook']=='view') {
-	$info_thread=get_thread_information(Security::remove_XSS($_GET['thread']));
-	$interbreadcrumb[]=array("url" => "viewforum.php?forum=".$info_thread['forum_id']."&amp;search=".Security::remove_XSS(urlencode($_GET['search'])),"name" => prepare4display($current_forum['forum_title']));
-} else {
-	$interbreadcrumb[]=array("url" => "viewforum.php?forum=".Security::remove_XSS($_GET['forum'])."&amp;search=".Security::remove_XSS(urlencode($_GET['search'])),"name" => prepare4display($current_forum['forum_title']));
-}
-if ($message<>'PostDeletedSpecial') {
-	
-	if (isset($_GET['gradebook']) && $_GET['gradebook']=='view') {
-		$info_thread=get_thread_information(Security::remove_XSS($_GET['thread']));
-		$interbreadcrumb[]=array("url" => "viewthread.php?forum=".$info_thread['forum_id']."&amp;thread=".Security::remove_XSS($_GET['thread']),"name" => prepare4display($current_thread['thread_title']));
-	} else {
-		$interbreadcrumb[]=array("url" => "viewthread.php?forum=".Security::remove_XSS($_GET['forum'])."&amp;thread=".Security::remove_XSS($_GET['thread']),"name" => prepare4display($current_thread['thread_title']));
-	}
-}
-
-
-if ($origin=='learnpath') {
-	include(api_get_path(INCLUDE_PATH).'reduced_header.inc.php');
-} else {
-	// the last element of the breadcrumb navigation is already set in interbreadcrumb, so give empty string
-	
-	Display::display_header('');
-	api_display_tool_title($nameTools);
-}
-
-$userinf=api_get_user_info(api_get_user_id());
-if ($userinf['status']=='1') {
-	echo "<strong>".get_lang('QualifyThread')."</strong>";
-	echo "<br />";
-	$current_thread=get_thread_information($_GET['thread']);
-	$userid=(int)$_GET['user_id'];
-	$threadid=$current_thread['thread_id'];
-	//show current qualify in my form
-	$qualify=current_qualify_of_thread($threadid,api_get_session_id());
-	//show max qualify in my form
-	$max_qualify=show_qualify('2',$_GET['cidReq'],$_GET['forum'],$userid,$threadid);
-	require_once 'forumbody.inc.php';
-	$value_return = store_theme_qualify($userid,$threadid,$_REQUEST['idtextqualify'],api_get_user_id(),date("Y-m-d H:i:s"),api_get_session_id());
-	$url='cidReq='.Security::remove_XSS($_GET['cidReq']).'&forum='.Security::remove_XSS($_GET['forum']).'&thread='.Security::remove_XSS($_GET['thread']).'&post='.Security::remove_XSS($_GET['post']).'&origin='.$origin.'&user_id='.Security::remove_XSS($_GET['user_id']);
-	$current_qualify_thread=show_qualify('1',$_GET['cidReq'],$_GET['forum'],$userid,$threadid);
-		
-	if ($value_return[0]!=$_REQUEST['idtextqualify'] && $value_return[1]=='update') {		
-		store_qualify_historical('1','',$_GET['forum'],$userid,$threadid,$_REQUEST['idtextqualify'],api_get_user_id());
-	}
-	
-	if (!empty($_REQUEST['idtextqualify']) && $_REQUEST['idtextqualify'] > $max_qualify) { 
-		$return_message = get_lang('QualificationNotBeGreaterThanMaxScore');	
-		Display :: display_error_message($return_message,false);
-	}
-		
-	// show qualifications history
-	$user_id_thread = (int)$_GET['user_id'];
-	$opt=Database::escape_string($_GET['type']);
-	$qualify_historic = get_historical_qualify($user_id_thread, $threadid, $opt);
-	$counter= count($qualify_historic);	
-	if ($counter>0) {
-		echo '<h4>'.get_lang('QualificationChangesHistory').'</h4>';	
-		if ($_GET['type'] == 'false') {
-			echo '<div style="float:left; clear:left">'.get_lang('OrderBy').'&nbsp;:<a href="forumqualify.php?'.api_get_cidreq().'&forum='.Security::remove_XSS($_GET['forum']).'&origin='.$origin.'&thread='.$threadid.'&user_id='.Security::remove_XSS($_GET['user_id']).'&type=true">'.get_lang('MoreRecent').'</a>&nbsp;|
-					'.get_lang('Older').'
-				  </div>';
-		} else {
-			echo '<div style="float:left; clear:left">'.get_lang('OrderBy').'&nbsp;:'.get_lang('MoreRecent').' |
-					<a href="forumqualify.php?'.api_get_cidreq().'&forum='.Security::remove_XSS($_GET['forum']).'&origin='.$origin.'&thread='.$threadid.'&user_id='.Security::remove_XSS($_GET['user_id']).'&type=false">'.get_lang('Older').'</a>&nbsp;
-				  </div>';
-		}				
-		$table_list.= '<br /><br /><table class="data_table" style="width:100%">';	
-		$table_list.= '<tr>';
-		$table_list.= '<th width="50%">'.get_lang('WhoChanged').'</th>';
-		$table_list.= '<th width="10%">'.get_lang('NoteChanged').'</th>';				
-		$table_list.= '<th width="40%">'.get_lang('DateChanged').'</th>';	
-		$table_list.= '</tr>';
-		for($i=0;$i<count($qualify_historic);$i++) {
-			    $my_user_info=api_get_user_info($qualify_historic['user_id']);
-				$name = $my_user_info['firstName']." ".$my_user_info['lastName'];					
-				$table_list.= '<tr class="$class"><td>'.$name.'</td>';			
-				$table_list.= '<td>'.$qualify_historic[$i]['qualify'].'</td>';
-				$table_list.= '<td>'.$qualify_historic[$i]['qualify_time'].'</td></tr>';			
-		}						
-		$table_list.= '</table>';
-		echo $table_list;
-		
-	} else {
-		echo get_lang('NotChanged');
-	}			
-} else {
-	api_not_allowed();	
-}
-//footer
-if ($origin != 'learnpath') {
-	Display :: display_footer();
+<?php
+/*
+==============================================================================
+	Dokeos - elearning and course management software
+
+	Copyright (c) 2008 Dokeos Latinoamerica SAC
+	For a full list of contributors, see "credits.txt".
+	The full license can be read in "license.txt".
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	See the GNU General Public License for more details.
+
+	Contact address: Dokeos, 108 rue du Corbeau, B-1030 Brussels, Belgium
+	Mail: info@dokeos.com
+==============================================================================
+*/
+/**
+* 	@package dokeos.forum
+*/
+// name of the language file that needs to be included
+$language_file=array('admin','forum');
+require '../inc/global.inc.php';
+require_once 'forumconfig.inc.php';
+require_once 'forumfunction.inc.php';
+$nameTools = get_lang('Forum');
+$this_section = SECTION_COURSES;
+
+$allowed_to_edit = api_is_allowed_to_edit(true,true);
+if (!$allowed_to_edit) {
+	api_not_allowed(true);
+}
+
+$origin = '';
+$origin_string='';
+if (isset($_GET['origin'])) {
+	$origin =  Security::remove_XSS($_GET['origin']);
+}
+
+// including additional library scripts
+require_once (api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php');
+include_once (api_get_path(LIBRARY_PATH).'groupmanager.lib.php');
+//require_once (api_get_path(LIBRARY_PATH).'resourcelinker.lib.php');
+$nameTools=get_lang('Forum');
+
+/*
+-----------------------------------------------------------
+	Including necessary files
+-----------------------------------------------------------
+*/
+
+$htmlHeadXtra[] = '<script type="text/javascript" src="'.api_get_path(WEB_CODE_PATH).'inc/lib/javascript/jquery.js" ></script>';
+$htmlHeadXtra[] = '<script language="javascript">
+										$(document).ready(function(){ $(\'.hide-me\').slideUp() });
+									function hidecontent(content){ $(content).slideToggle(\'normal\'); } 
+									</script>';
+
+//are we in a lp ?
+$origin = '';
+if (isset($_GET['origin'])) {
+	$origin =  Security::remove_XSS($_GET['origin']);
+}
+/*
+==============================================================================
+		MAIN DISPLAY SECTION
+==============================================================================
+*/
+/*
+-----------------------------------------------------------
+	Retrieving forum and forum categorie information
+-----------------------------------------------------------
+*/
+// we are getting all the information about the current forum and forum category.
+// note pcool: I tried to use only one sql statement (and function) for this
+// but the problem is that the visibility of the forum AND forum cateogory are stored in the item_property table
+$current_thread=get_thread_information($_GET['thread']); // note: this has to be validated that it is an existing thread
+$current_forum=get_forum_information($current_thread['forum_id']); // note: this has to be validated that it is an existing forum.
+$current_forum_category=get_forumcategory_information($current_forum['forum_category']);
+$whatsnew_post_info=$_SESSION['whatsnew_post_info'];
+$interbreadcrumb[]=array("url" => "index.php?search=".Security::remove_XSS(urlencode($_GET['search'])),"name" => $nameTools);
+$interbreadcrumb[]=array("url" => "viewforumcategory.php?forumcategory=".$current_forum_category['cat_id']."&amp;search=".Security::remove_XSS(urlencode($_GET['search'])),"name" => prepare4display($current_forum_category['cat_title']));
+
+/*
+-----------------------------------------------------------
+	Header and Breadcrumbs
+-----------------------------------------------------------
+*/
+if ($origin=='learnpath') {
+	include(api_get_path(INCLUDE_PATH).'reduced_header.inc.php');
+} else {
+	$interbreadcrumb[]=array("url" => "index.php?search=".Security::remove_XSS(urlencode($_GET['search'])),"name" => $nameTools);
+	$interbreadcrumb[]=array("url" => "viewforumcategory.php?forumcategory=".$current_forum_category['cat_id']."&amp;search=".Security::remove_XSS(urlencode($_GET['search'])),"name" => prepare4display($current_forum_category['cat_title']));
+	if (isset($_GET['gradebook']) and $_GET['gradebook']=='view') {
+		$info_thread=get_thread_information(Security::remove_XSS($_GET['thread']));
+		$interbreadcrumb[]=array("url" => "viewforum.php?forum=".$info_thread['forum_id']."&amp;origin=".$origin."&amp;search=".Security::remove_XSS(urlencode($_GET['search'])),"name" => prepare4display($current_forum['forum_title']));	
+	} else {
+		$interbreadcrumb[]=array("url" => "viewforum.php?forum=".Security::remove_XSS($_GET['forum'])."&amp;origin=".$origin."&amp;search=".Security::remove_XSS(urlencode($_GET['search'])),"name" => prepare4display($current_forum['forum_title']));
+	}
+
+	if ($message<>'PostDeletedSpecial') {
+		if (isset($_GET['gradebook']) and $_GET['gradebook']=='view') {
+			$info_thread=get_thread_information(Security::remove_XSS($_GET['thread']));
+			$interbreadcrumb[]=array("url" => "viewthread.php?forum=".$info_thread['forum_id']."&amp;thread=".Security::remove_XSS($_GET['thread']),"name" => prepare4display($current_thread['thread_title']));
+		} else {
+			$interbreadcrumb[]=array("url" => "viewthread.php?forum=".Security::remove_XSS($_GET['forum'])."&amp;thread=".Security::remove_XSS($_GET['thread']),"name" => prepare4display($current_thread['thread_title']));
+		}
+	}
+	// the last element of the breadcrumb navigation is already set in interbreadcrumb, so give empty string
+	Display :: display_header('');
+	api_display_tool_title($nameTools);
+}
+
+/*
+-----------------------------------------------------------
+	Is the user allowed here?
+-----------------------------------------------------------
+*/
+// if the user is not a course administrator and the forum is hidden
+// then the user is not allowed here.
+if (!api_is_allowed_to_edit(false,true) AND ($current_forum['visibility']==0 OR $current_thread['visibility']==0)) {
+	forum_not_allowed_here();
+}
+
+
+/*
+-----------------------------------------------------------
+	Actions
+-----------------------------------------------------------
+*/
+if ($_GET['action']=='delete' && isset($_GET['content']) && isset($_GET['id']) && api_is_allowed_to_edit(false,true)) {
+	$message=delete_post($_GET['id']); // note: this has to be cleaned first
+}
+if (($_GET['action']=='invisible' || $_GET['action']=='visible') && isset($_GET['id']) && api_is_allowed_to_edit(false,true)) {
+	$message=approve_post($_GET['id'],$_GET['action']); // note: this has to be cleaned first
+}
+if ($_GET['action']=='move' and isset($_GET['post'])) {
+	$message=move_post_form();
+}
+
+/*
+-----------------------------------------------------------
+	Display the action messages
+-----------------------------------------------------------
+*/
+if (!empty($message)) {
+	Display :: display_confirmation_message(get_lang($message));
+}
+
+if ($message<>'PostDeletedSpecial') {// in this case the first and only post of the thread is removed
+	// this increases the number of times the thread has been viewed
+	increase_thread_view($_GET['thread']);
+
+	/*
+	-----------------------------------------------------------
+		Action Links
+	-----------------------------------------------------------
+	*/
+/*	echo '<div style="float:right;">';
+	$my_url = '<a href="viewthread.php?'.api_get_cidreq().'&amp;forum='.Security::remove_XSS($_GET['forum']).'&amp;thread='.Security::remove_XSS($_GET['thread']).'&amp;origin='.$origin.'&amp;search='.Security::remove_XSS(urlencode($_GET['search']));
+	echo $my_url.'&amp;view=flat&origin='.$origin.'">'.get_lang('FlatView').'</a> | ';
+	echo $my_url.'&amp;view=threaded&origin='.$origin.'">'.get_lang('ThreadedView').'</a> | ';
+	echo $my_url.'&amp;view=nested&origin='.$origin.'">'.get_lang('NestedView').'</a>';
+	$my_url = null;
+	echo '</div>';*/
+	// the reply to thread link should only appear when the forum_category is not locked AND the forum is not locked AND the thread is not locked.
+	// if one of the three levels is locked then the link should not be displayed
+	if ($current_forum_category['locked']==0 AND $current_forum['locked']==0 AND $current_thread['locked']==0 OR api_is_allowed_to_edit(false,true)) {
+		// The link should only appear when the user is logged in or when anonymous posts are allowed.
+		if ($_user['user_id'] OR ($current_forum['allow_anonymous']==1 AND !$_user['user_id'])) {
+			//reply link
+			/*echo '<a href="reply.php?'.api_get_cidreq().'&forum='.Security::remove_XSS($_GET['forum']).'&amp;thread='.Security::remove_XSS($_GET['thread']).'&amp;action=replythread&origin='.$origin.'">'.get_lang('ReplyToThread').'</a>';*/
+			
+			//new thread link
+			if (api_is_allowed_to_edit(false,true) OR ($current_forum['allow_new_threads']==1 AND isset($_user['user_id'])) OR ($current_forum['allow_new_threads']==1 AND !isset($_user['user_id']) AND $current_forum['allow_anonymous']==1)) {
+				if ($current_forum['locked'] <> 1 AND $current_forum['locked'] <> 1) {
+					echo '&nbsp;&nbsp;'; 
+					/*echo '<a href="newthread.php?'.api_get_cidreq().'&forum='.Security::remove_XSS($_GET['forum']).$origin_string.'">'.Display::return_icon('forumthread_new.gif').' '.get_lang('NewTopic').'</a>';*/
+				} else {
+					echo get_lang('ForumLocked');
+				}
+			}
+		}
+	}
+	// note: this is to prevent that some browsers display the links over the table (FF does it but Opera doesn't)
+	echo '&nbsp;';
+	
+	/*
+	-----------------------------------------------------------
+		Display Forum Category and the Forum information
+	-----------------------------------------------------------
+	*/
+	if (!$_SESSION['view']) {
+		$viewmode=$current_forum['default_view'];
+	} else {
+		$viewmode=$_SESSION['view'];
+	}
+
+	$viewmode_whitelist=array('flat', 'threaded', 'nested');
+	if (isset($_GET['view']) and in_array($_GET['view'],$viewmode_whitelist)) {
+		$viewmode=Database::escape_string($_GET['view']);
+		$_SESSION['view']=$viewmode;
+	} 
+	if (empty($viewmode)) {
+		$viewmode = 'flat';
+	}
+
+	/*
+	-----------------------------------------------------------
+		Display Forum Category and the Forum information
+	-----------------------------------------------------------
+	*/
+	// we are getting all the information about the current forum and forum category.
+	// note pcool: I tried to use only one sql statement (and function) for this
+	// but the problem is that the visibility of the forum AND forum cateogory are stored in the item_property table
+	echo "<table class=\"data_table\" width=\"100%\">\n";
+
+	// the thread	
+	echo "\t<tr>\n\t\t<th style=\"padding-left:5px;\" align=\"left\" colspan=\"6\">";		
+	echo '<span class="forum_title">'.prepare4display($current_thread['thread_title']).'</span><br />';
+	
+	if ($origin!='learnpath') {		
+		echo '<span class="forum_low_description">'.prepare4display($current_forum_category['cat_title']).' - ';				
+	}
+		
+	echo prepare4display($current_forum['forum_title']).'<br />';						
+	echo "</th>\n";
+	echo "\t</tr>\n";		
+	echo '<span>'.prepare4display($current_thread['thread_comment']).'</span>';	
+	echo "</table>";
+		
+	include_once('viewpost.inc.php');
+} // if ($message<>'PostDeletedSpecial') // in this case the first and only post of the thread is removed
+
+
+$userinf=api_get_user_info(api_get_user_id());
+if ($allowed_to_edit) {
+	//echo "<strong>".get_lang('QualifyThread')."</strong>";
+	//echo "<br />";
+	$current_thread=get_thread_information($_GET['thread']);
+	$userid=(int)$_GET['user_id'];
+	$threadid=$current_thread['thread_id'];
+	//show current qualify in my form
+	$qualify=current_qualify_of_thread($threadid,api_get_session_id());
+	//show max qualify in my form
+	$max_qualify=show_qualify('2',$_GET['cidReq'],$_GET['forum'],$userid,$threadid);
+	require_once 'forumbody.inc.php';
+	$value_return = store_theme_qualify($userid,$threadid,$_REQUEST['idtextqualify'],api_get_user_id(),date("Y-m-d H:i:s"),api_get_session_id());
+	$url='cidReq='.Security::remove_XSS($_GET['cidReq']).'&forum='.Security::remove_XSS($_GET['forum']).'&thread='.Security::remove_XSS($_GET['thread']).'&post='.Security::remove_XSS($_GET['post']).'&origin='.$origin.'&user_id='.Security::remove_XSS($_GET['user_id']);
+	$current_qualify_thread=show_qualify('1',$_GET['cidReq'],$_GET['forum'],$userid,$threadid);
+		
+	if ($value_return[0]!=$_REQUEST['idtextqualify'] && $value_return[1]=='update') {		
+		store_qualify_historical('1','',$_GET['forum'],$userid,$threadid,$_REQUEST['idtextqualify'],api_get_user_id());
+	}
+	
+	if (!empty($_REQUEST['idtextqualify']) && $_REQUEST['idtextqualify'] > $max_qualify) { 
+		$return_message = get_lang('QualificationCanNotBeGreaterThanMaxScore');	
+		Display :: display_error_message($return_message,false);
+	}
+	// show qualifications history
+	$user_id_thread = (int)$_GET['user_id'];
+	$opt=Database::escape_string($_GET['type']);
+	$qualify_historic = get_historical_qualify($user_id_thread, $threadid, $opt);
+	$counter= count($qualify_historic);
+	$act_qualify = $_REQUEST['idtextqualify'];	
+	if ($counter>0) {
+		echo '<h4>'.get_lang('QualificationChangesHistory').'</h4>';	
+		if ($_GET['type'] == 'false') {
+			echo '<div style="float:left; clear:left">'.get_lang('OrderBy').'&nbsp;:<a href="forumqualify.php?'.api_get_cidreq().'&forum='.Security::remove_XSS($_GET['forum']).'&origin='.$origin.'&thread='.$threadid.'&user='.Security::remove_XSS($_GET['user']).'&user_id='.Security::remove_XSS($_GET['user_id']).'&type=true&idtextqualify='.$act_qualify.'#history">'.get_lang('MoreRecent').'</a>&nbsp;|
+					'.get_lang('Older').'
+				  </div>';
+		} else {
+			echo '<div style="float:left; clear:left">'.get_lang('OrderBy').'&nbsp;:'.get_lang('MoreRecent').' |
+					<a href="forumqualify.php?'.api_get_cidreq().'&forum='.Security::remove_XSS($_GET['forum']).'&origin='.$origin.'&thread='.$threadid.'&user='.Security::remove_XSS($_GET['user']).'&user_id='.Security::remove_XSS($_GET['user_id']).'&type=false&idtextqualify='.$act_qualify.'#history">'.get_lang('Older').'</a>&nbsp;
+				  </div>';
+		}				
+		$table_list.= '<a name="history" /><br /><br /><table class="data_table" style="width:100%">';	
+		$table_list.= '<tr>';
+		$table_list.= '<th width="50%">'.get_lang('WhoChanged').'</th>';
+		$table_list.= '<th width="10%">'.get_lang('NoteChanged').'</th>';				
+		$table_list.= '<th width="40%">'.get_lang('DateChanged').'</th>';	
+		$table_list.= '</tr>';
+		
+		for($i=0;$i<count($qualify_historic);$i++) {
+			    $my_user_info=api_get_user_info($qualify_historic['user_id']);
+				$name = $my_user_info['firstName']." ".$my_user_info['lastName'];					
+				$table_list.= '<tr class="'.$class.'"><td>'.$name.'</td>';			
+				$table_list.= '<td>'.$qualify_historic[$i]['qualify'].'</td>';
+				$table_list.= '<td>'.$qualify_historic[$i]['qualify_time'].'</td></tr>';			
+		}						
+		$table_list.= '</table>';
+		echo $table_list;
+		
+	} else {
+		echo get_lang('NotChanged');
+	}			
+} else {
+	api_not_allowed();	
+}
+
+/*
+==============================================================================
+		FOOTER
+==============================================================================
+*/
+if ($origin!='learnpath') {
+	Display :: display_footer();
 }
\ No newline at end of file
diff --git a/main/forum/iframe_thread.php b/main/forum/iframe_thread.php
index fe68b2789b..420c844986 100644
--- a/main/forum/iframe_thread.php
+++ b/main/forum/iframe_thread.php
@@ -161,7 +161,7 @@ while ($row=Database::fetch_array($result)) {
 	} else {
 		$name=$row['firstname'].' '.$row['lastname'];
 	}
-	echo display_user_link($row['user_id'], $name).'<br />';
+	echo $name.'<br />';
 	echo $row['post_date'].'<br /><br />';
 
 	echo "</td>\n";
diff --git a/main/forum/viewforum.php b/main/forum/viewforum.php
index 754236be92..d79b36d751 100644
--- a/main/forum/viewforum.php
+++ b/main/forum/viewforum.php
@@ -202,7 +202,7 @@ if ($my_action == 'liststd' AND isset($_GET['content']) AND isset($_GET['id']) A
 		$table_list.= '<center><br /><table class="data_table" style="width:50%">';
 		// The column headers (to do: make this sortable)
 		$table_list.= '<tr >';
-		$table_list.= '<th height="24">'.get_lang('NamesAndFirstNames').'</th>';
+		$table_list.= '<th height="24">'.get_lang('NamesAndLastNames').'</th>';
 	
 		if ($_GET['list']=='qualify') {		
 			$table_list.= '<th>'.get_lang('Qualify').'</th>';
@@ -226,7 +226,7 @@ if ($my_action == 'liststd' AND isset($_GET['content']) AND isset($_GET['id']) A
 			}
 			if ($userinf['status']=='1') {
 				$current_qualify_thread=show_qualify('1',$_GET['cidReq'],$my_forum,$row_student_list['user_id'],$_GET['id']);					
-				$table_list.= '<td><a href="forumqualify.php?'.api_get_cidreq().'&forum='.Security::remove_XSS($my_forum).'&thread='.Security::remove_XSS($_GET['id']).'&user_id='.$row_student_list['user_id'].'&idtextqualify='.$current_qualify_thread.'&origin='.$origin.'">'.icon('../img/'.$icon_qualify,get_lang('Qualify')).'</a></td></tr>';
+				$table_list.= '<td><a href="forumqualify.php?'.api_get_cidreq().'&forum='.Security::remove_XSS($my_forum).'&thread='.Security::remove_XSS($_GET['id']).'&user='.$row_student_list['user_id'].'&user_id='.$row_student_list['user_id'].'&idtextqualify='.$current_qualify_thread.'&origin='.$origin.'">'.icon('../img/'.$icon_qualify,get_lang('Qualify')).'</a></td></tr>';
 			}
 			$counter_stdlist++;
 		}	
diff --git a/main/forum/viewpost.inc.php b/main/forum/viewpost.inc.php
index bcbb1dfe96..b53ed8a5dc 100644
--- a/main/forum/viewpost.inc.php
+++ b/main/forum/viewpost.inc.php
@@ -25,82 +25,84 @@
 $rows = get_thread_user_post($current_thread['thread_id'], $_GET['user']);
 $sw = true;
 
-foreach ($rows as $row) {	
-	if ($row['status']=='0') {
-		$style =" id = 'post".$post_en."' class=\"hide-me\" style=\"border:1px solid red; display:none; background-color:#F7F7F7; width:95%; margin: 0px 0px 4px 40px; \" ";
-		$url_post ='';
-	} else {
-		$style = "";
-		$post_en = $row['post_parent_id'];
-		$url_post = '<a href="javascript:;" onclick="javascript:hidecontent(\'#post'.$row['post_parent_id'].'\')"> '.get_lang('ViewComentPost').'</a> ';
-	}
-	
-	if ($row['user_id']=='0') {
-		$name=prepare4display($row['poster_name']);
-	} else {
-		$name=$row['firstname'].' '.$row['lastname'];
-	}
-	if($sw === true) {
-		echo "<div style=\"border: 1px solid #000000; padding: 4px 0px 0px 4px; margin-top:5px;\" > <h3> $name </h3> </div>";
-		$sw = false;
-	}
-	echo "<div ".$style."><table width=\"100%\" class=\"post\" cellspacing=\"5\" border=\"0\" >\n";
-	// the style depends on the status of the message: approved or not
-	//echo 'dd'.$row['status'];
-	
-		 
-	if ($row['visible']=='0') {
-		$titleclass='forum_message_post_title_2_be_approved';
-		$messageclass='forum_message_post_text_2_be_approved';
-		$leftclass='forum_message_left_2_be_approved';	
-	} else {
-		$titleclass='forum_message_post_title';
-		$messageclass='forum_message_post_text';
-		$leftclass='forum_message_left';		
-	}
-	
-	echo "\t<tr>\n";
-	echo "\t\t<td rowspan=\"3\" class=\"$leftclass\">";
-	
-	echo '<br /><b>'.$row['post_date'].'</b><br />';
-	
-	if (api_is_allowed_to_edit()) {	
-		echo $url_post;
-	}
-	
-	echo "</td>\n";
-	
-	// The post title
-	echo "\t\t<td class=\"$titleclass\">".prepare4display($row['post_title'])."</td>\n";
-	echo "\t</tr>\n";	
-	
-	// The post message
-	echo "\t<tr >\n";
-	echo "\t\t<td class=\"$messageclass\">".prepare4display($row['post_text'])."</td>\n";
-	echo "\t</tr>\n";
-	
-	// The check if there is an attachment
-	$attachment_list=get_attachment($row['post_id']);	
-	
-	if (!empty($attachment_list)) {
-		echo '<tr ><td height="50%">';	
-		$realname=$attachment_list['path'];			
-		$user_filename=$attachment_list['filename'];
+if(isset($rows)){
+	foreach ($rows as $row) {	
+		if ($row['status']=='0') {
+			$style =" id = 'post".$post_en."' class=\"hide-me\" style=\"border:1px solid red; display:none; background-color:#F7F7F7; width:95%; margin: 0px 0px 4px 40px; \" ";
+			$url_post ='';
+		} else {
+			$style = "";
+			$post_en = $row['post_parent_id'];
+			$url_post = '<a href="javascript:;" onclick="javascript:hidecontent(\'#post'.$row['post_parent_id'].'\')"> '.get_lang('ViewComentPost').'</a> ';
+		}
+		
+		if ($row['user_id']=='0') {
+			$name=prepare4display($row['poster_name']);
+		} else {
+			$name=$row['firstname'].' '.$row['lastname'];
+		}
+		if($sw === true) {
+			echo "<div style=\"border: 1px solid #000000; padding: 4px 0px 0px 4px; margin-top:5px;\" > <h3> $name </h3> </div>";
+			$sw = false;
+		}
+		echo "<div ".$style."><table width=\"100%\" class=\"post\" cellspacing=\"5\" border=\"0\" >\n";
+		// the style depends on the status of the message: approved or not
+		//echo 'dd'.$row['status'];
+		
+			 
+		if ($row['visible']=='0') {
+			$titleclass='forum_message_post_title_2_be_approved';
+			$messageclass='forum_message_post_text_2_be_approved';
+			$leftclass='forum_message_left_2_be_approved';	
+		} else {
+			$titleclass='forum_message_post_title';
+			$messageclass='forum_message_post_text';
+			$leftclass='forum_message_left';		
+		}
+		
+		echo "\t<tr>\n";
+		echo "\t\t<td rowspan=\"3\" class=\"$leftclass\">";
+		
+		echo '<br /><b>'.$row['post_date'].'</b><br />';
+		
+		if (api_is_allowed_to_edit()) {	
+			echo $url_post;
+		}
+		
+		echo "</td>\n";
+		
+		// The post title
+		echo "\t\t<td class=\"$titleclass\">".prepare4display($row['post_title'])."</td>\n";
+		echo "\t</tr>\n";	
+		
+		// The post message
+		echo "\t<tr >\n";
+		echo "\t\t<td class=\"$messageclass\">".prepare4display($row['post_text'])."</td>\n";
+		echo "\t</tr>\n";
+		
+		// The check if there is an attachment
+		$attachment_list=get_attachment($row['post_id']);	
+		
+		if (!empty($attachment_list)) {
+			echo '<tr ><td height="50%">';	
+			$realname=$attachment_list['path'];			
+			$user_filename=$attachment_list['filename'];
+			
+			echo Display::return_icon('attachment.gif',get_lang('Attachment'));
+			echo '<a href="download.php?file=';		
+			echo $realname;
+			echo ' "> '.$user_filename.' </a>';
+			echo '<span class="forum_attach_comment" >'.$attachment_list['comment'].'</span><br />';	
+			echo '</td></tr>';		
+		}
 		
-		echo Display::return_icon('attachment.gif',get_lang('Attachment'));
-		echo '<a href="download.php?file=';		
-		echo $realname;
-		echo ' "> '.$user_filename.' </a>';
-		echo '<span class="forum_attach_comment" >'.$attachment_list['comment'].'</span><br />';	
-		echo '</td></tr>';		
+		// The post has been displayed => it can be removed from the what's new array
+		unset($whatsnew_post_info[$current_forum['forum_id']][$current_thread['thread_id']][$row['post_id']]);
+		unset($whatsnew_post_info[$current_forum['forum_id']][$current_thread['thread_id']]);
+		unset($_SESSION['whatsnew_post_info'][$current_forum['forum_id']][$current_thread['thread_id']][$row['post_id']]);
+		unset($_SESSION['whatsnew_post_info'][$current_forum['forum_id']][$current_thread['thread_id']]);
+		echo "</table></div>";
 	}
-	
-	// The post has been displayed => it can be removed from the what's new array
-	unset($whatsnew_post_info[$current_forum['forum_id']][$current_thread['thread_id']][$row['post_id']]);
-	unset($whatsnew_post_info[$current_forum['forum_id']][$current_thread['thread_id']]);
-	unset($_SESSION['whatsnew_post_info'][$current_forum['forum_id']][$current_thread['thread_id']][$row['post_id']]);
-	unset($_SESSION['whatsnew_post_info'][$current_forum['forum_id']][$current_thread['thread_id']]);
-	echo "</table></div>";
 }
 
 $userid = (int)$_GET['user_id'];
@@ -116,19 +118,10 @@ if(isset($_POST['idtextqualify']))
 	store_theme_qualify($userid,$threadid,$qualify,$_SESSION['_user']['user_id'],date('Y-m-d H:i:s'),'');
 }
  
-$result = get_statistical_information($current_thread['thread_id'], $_GET['user'], $_GET['cidReq']);
+$result = get_statistical_information($current_thread['thread_id'], $_GET['user_id'], $_GET['cidReq']);
 if($userinf['status']!='1') {
 	echo '<div class="forum-qualification-input-box">';
 	require_once 'forumbody.inc.php';
-	echo '<a href="forumqualify.php?'.api_get_cidreq().'&forum='.Security::remove_XSS($_GET['forum']).'&thread='.Security::remove_XSS($_GET['thread']).'&origin='.$origin.'&user_id='.$userid.'">'.get_lang('ViewHistoryChange').'</a>';
+	//echo '<a href="forumqualify.php?'.api_get_cidreq().'&forum='.Security::remove_XSS($_GET['forum']).'&thread='.Security::remove_XSS($_GET['thread']).'&origin='.$origin.'&user_id='.$userid.'">'.get_lang('ViewHistoryChange').'</a>';
 	echo '</div>';
 }
-echo '<div class="forum-qualification-stats-box">
-		  <b>'.get_lang('StatisticalForum').':<br>
-			---------------------<br>			
-			'.get_lang('UserCourse').' : '.$result['user_course'].' <br/>
-			'.get_lang('NumberPosts').' : '.$result['post'].' <br/>		 
-			'.get_lang('NumberUserPost').' : '.$result['user_post'].' <br/>
-			'.get_lang('PromedioPostUser').' : '.$result['user_post']/$result['post'].' <br/>
-			</b></div>
-		 ';
\ No newline at end of file
diff --git a/main/forum/viewthread_flat.inc.php b/main/forum/viewthread_flat.inc.php
index 7656831277..10a24939fa 100644
--- a/main/forum/viewthread_flat.inc.php
+++ b/main/forum/viewthread_flat.inc.php
@@ -73,9 +73,9 @@ foreach ($rows as $row) {
 			$current_qualify_thread=show_qualify('1',$_GET['cidReq'],$_GET['forum'],$row['poster_id'],$_GET['thread']);
 			if( isset($_GET['gradebook'])){
 				$info_thread=get_thread_information(Security::remove_XSS($_GET['thread']));
-				echo "<a href=\"viewpost.php?".api_get_cidreq()."&forum=".$info_thread['forum_id']."&amp;thread=".Security::remove_XSS($_GET['thread'])."&amp;action=list&amp;post=".$row['post_id']."&amp;user=".$row['poster_id']."&user_id=".$row['poster_id']."&origin=".$origin."&idtextqualify=".$current_qualify_thread."&gradebook=".$_GET['gradebook']."\" >".icon('../img/new_test_small.gif',get_lang('Qualify'))."</a>\n";			
+				echo "<a href=\"forumqualify.php?".api_get_cidreq()."&forum=".$info_thread['forum_id']."&amp;thread=".Security::remove_XSS($_GET['thread'])."&amp;action=list&amp;post=".$row['post_id']."&amp;user=".$row['poster_id']."&user_id=".$row['poster_id']."&origin=".$origin."&idtextqualify=".$current_qualify_thread."&gradebook=".$_GET['gradebook']."\" >".icon('../img/new_test_small.gif',get_lang('Qualify'))."</a>\n";			
 			} else {
-				echo "<a href=\"viewpost.php?".api_get_cidreq()."&forum=".Security::remove_XSS($_GET['forum'])."&amp;thread=".Security::remove_XSS($_GET['thread'])."&amp;action=list&amp;post=".$row['post_id']."&amp;user=".$row['poster_id']."&user_id=".$row['poster_id']."&origin=".$origin."&idtextqualify=".$current_qualify_thread."\" >".icon('../img/new_test_small.gif',get_lang('Qualify'))."</a>\n";				
+				echo "<a href=\"forumqualify.php?".api_get_cidreq()."&forum=".Security::remove_XSS($_GET['forum'])."&amp;thread=".Security::remove_XSS($_GET['thread'])."&amp;action=list&amp;post=".$row['post_id']."&amp;user=".$row['poster_id']."&user_id=".$row['poster_id']."&origin=".$origin."&idtextqualify=".$current_qualify_thread."\" >".icon('../img/new_test_small.gif',get_lang('Qualify'))."</a>\n";				
 			}		
 		}	
 	}
diff --git a/main/forum/viewthread_nested.inc.php b/main/forum/viewthread_nested.inc.php
index 4d31b3c20a..7c1e207178 100644
--- a/main/forum/viewthread_nested.inc.php
+++ b/main/forum/viewthread_nested.inc.php
@@ -80,7 +80,7 @@ foreach ($rows as $post) {
 	if($userinf['status']!='1')	{
 		if(api_is_allowed_to_edit()) {						
 			$current_qualify_thread=show_qualify('1',$_GET['cidReq'],$_GET['forum'],$post['user_id'],$_GET['thread']);
-			echo "<a href=\"viewpost.php?".api_get_cidreq()."&forum=".Security::remove_XSS($_GET['forum'])."&amp;thread=".Security::remove_XSS($_GET['thread'])."&amp;action=list&amp;post=".$post['post_id']."&amp;user=".$post['user_id']."&user_id=".$post['user_id']."&origin=".$origin."&idtextqualify=".$current_qualify_thread."\" >".icon('../img/new_test_small.gif',get_lang('Qualify'))."</a>\n";			
+			echo "<a href=\"forumqualify.php?".api_get_cidreq()."&forum=".Security::remove_XSS($_GET['forum'])."&amp;thread=".Security::remove_XSS($_GET['thread'])."&amp;action=list&amp;post=".$post['post_id']."&amp;user=".$post['user_id']."&user_id=".$post['user_id']."&origin=".$origin."&idtextqualify=".$current_qualify_thread."\" >".icon('../img/new_test_small.gif',get_lang('Qualify'))."</a>\n";			
 		}
 	}
 	echo '<br /><br />';
diff --git a/main/forum/viewthread_threaded.inc.php b/main/forum/viewthread_threaded.inc.php
index 1fe31c00d5..6192ea7f1f 100644
--- a/main/forum/viewthread_threaded.inc.php
+++ b/main/forum/viewthread_threaded.inc.php
@@ -246,7 +246,7 @@ $userinf=api_get_user_info($rows[$display_post_id]['user_id']);
 		if(api_is_allowed_to_edit())
 		{			
 			$current_qualify_thread=show_qualify('1',$_GET['cidReq'],$_GET['forum'],$rows[$display_post_id]['user_id'],$_GET['thread']);
-			echo "<a href=\"viewpost.php?".api_get_cidreq()."&forum=".Security::remove_XSS($_GET['forum'])."&amp;thread=".Security::remove_XSS($_GET['thread'])."&amp;action=list&amp;post=".$rows[$display_post_id]['post_id']."&amp;user=".$rows[$display_post_id]['user_id']."&user_id=".$rows[$display_post_id]['user_id']."&origin=".$origin."&idtextqualify=".$current_qualify_thread."\" >".icon('../img/new_test_small.gif',get_lang('Qualify'))."</a>\n";			
+			echo "<a href=\"forumqualify.php?".api_get_cidreq()."&forum=".Security::remove_XSS($_GET['forum'])."&amp;thread=".Security::remove_XSS($_GET['thread'])."&amp;action=list&amp;post=".$rows[$display_post_id]['post_id']."&amp;user=".$rows[$display_post_id]['user_id']."&user_id=".$rows[$display_post_id]['user_id']."&origin=".$origin."&idtextqualify=".$current_qualify_thread."\" >".icon('../img/new_test_small.gif',get_lang('Qualify'))."</a>\n";			
 		}	
 	}
 echo '<br /><br />';