diff --git a/user_portal.php b/user_portal.php
index 3725b492e1..6a3996ee6e 100644
--- a/user_portal.php
+++ b/user_portal.php
@@ -1,8 +1,7 @@
-<?php // $Id: user_portal.php 22375 2009-07-26 18:54:59Z herodoto $
+<?php
 
 /* For licensing terms, see /license.txt */
 /**
-==============================================================================
 *	This is the index file displayed when a user is logged in on Dokeos.
 *
 *	It displays:
@@ -16,8 +15,7 @@
 *	to modify settings
 *
 *	@todo rewrite code to separate display, logic, database code
-*	@package dokeos.main
-==============================================================================
+*	@package chamilo.main
 */
 
 /**
@@ -29,11 +27,8 @@
  * @todo display_digest, shouldn't this be removed and be made into an extension?
  */
 
-/*
-==============================================================================
-		INIT SECTION
-==============================================================================
-*/
+/*		INIT SECTION	*/
+
 // Don't change these settings
 define('SCRIPTVAL_No', 0);
 define('SCRIPTVAL_InCourseList', 1);
@@ -50,9 +45,7 @@ $language_file = array ('courses', 'index');
 $cidReset = true; /* Flag forcing the 'current course' reset,
 					as we're not inside a course anymore  */
 /*
------------------------------------------------------------
 	Included libraries
------------------------------------------------------------
 */
 require_once './main/inc/global.inc.php';
 $libpath = api_get_path(LIBRARY_PATH);
@@ -69,9 +62,7 @@ $htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jqu
 $htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.toggle.js" type="text/javascript" language="javascript"></script>';
 
 /*
------------------------------------------------------------
 	Table definitions
------------------------------------------------------------
 */
 //Database table definitions
 $main_user_table 		= Database :: get_main_table(TABLE_MAIN_USER);
@@ -81,9 +72,7 @@ $main_course_user_table = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
 $main_category_table 	= Database :: get_main_table(TABLE_MAIN_CATEGORY);
 
 /*
------------------------------------------------------------
 	Constants and CONFIGURATION parameters
------------------------------------------------------------
 */
 // ---- Course list options ----
 define('CONFVAL_showCourseLangIfNotSameThatPlatform', true);
@@ -137,9 +126,7 @@ $nameTools = get_lang('MyCourses');
 $this_section = SECTION_COURSES;
 
 /*
------------------------------------------------------------
 	Check configuration parameters integrity
------------------------------------------------------------
 */
 if (CONFVAL_showExtractInfo != SCRIPTVAL_UnderCourseList and $orderKey[0] != "keyCourse") {
 	// CONFVAL_showExtractInfo must be SCRIPTVAL_UnderCourseList to accept $orderKey[0] !="keyCourse"
@@ -175,7 +162,6 @@ Display :: display_header($nameTools);
 
 
 /*
-==============================================================================
 		FUNCTIONS
 
 		display_admin_links()
@@ -187,13 +173,10 @@ Display :: display_header($nameTools);
 		get_personal_course_list($user_id)
 		get_logged_user_course_html($my_course)
 		get_user_course_categories()
-==============================================================================
 */
 /*
------------------------------------------------------------
 	Database functions
 	some of these can go to database layer.
------------------------------------------------------------
 */
 
 /**
@@ -532,9 +515,7 @@ function display_courses_in_category($user_category_id) {
 }
 
 /*
------------------------------------------------------------
 	Display functions
------------------------------------------------------------
 */
 
 /**
diff --git a/webchatdeny.php b/webchatdeny.php
index 3ce89a1d13..4dec944759 100755
--- a/webchatdeny.php
+++ b/webchatdeny.php
@@ -1,14 +1,12 @@
 <?php
-/* For licensing terms, see /dokeos_license.txt */
+/* For licensing terms, see /license.txt */
 
 /**
  * @todo can't this be moved to a different file so that we can delete this file?
  * 		 Is this still in use? If not, then it should be removed or maybe offered as an extension
  */
 /**
-==============================================================================
 * Deletes the web-chat request form the user table
-==============================================================================
 */
 
 // name of the language file that needs to be included
@@ -30,10 +28,6 @@ Display::display_header();
 $message = get_lang('RequestDenied').'<br /><br /><a href="javascript: history.back();">'.get_lang('Back').'</a>';
 Display::display_normal_message($message);
 
-/*
-==============================================================================
-		FOOTER
-==============================================================================
-*/
+/*	FOOTER	*/
 
 Display::display_footer();
diff --git a/whoisonline.php b/whoisonline.php
index 6ea4381322..212f27a010 100755
--- a/whoisonline.php
+++ b/whoisonline.php
@@ -1,10 +1,8 @@
-<?php // $Id: whoisonline.php 21549 2009-06-21 14:02:37Z iflorespaz $
-/* For licensing terms, see /chamilo_license.txt */
+<?php
+/* For licensing terms, see /license.txt */
 
 /**
-==============================================================================
 * Who is online list
-==============================================================================
 */
 
 // language files that should be included
@@ -109,6 +107,7 @@ if ($_GET['chatid'] != '') {
 		$sql = "update $track_user_table set chatcall_user_id = '".Database::escape_string($_user['user_id'])."', chatcall_date = '".Database::escape_string($time)."', chatcall_text = '' where (user_id = ".(int)Database::escape_string($chatid).")";
 		$result = Database::query($sql);
 		//redirect caller to chat
+		
 		header("Location: ".$_configuration['code_append']."chat/chat.php?".api_get_cidreq()."&origin=whoisonline&target=".Security::remove_XSS($chatid));
 		exit;
 	}
@@ -133,17 +132,12 @@ if ((api_get_setting('showonline', 'world') == 'true' && !$_user['user_id']) ||
 				//this include the social menu div
 				SocialManager::show_social_menu('whoisonline');
 				echo '</div>';
-			}
-
-
+			}			
+			/*
 			if ($_GET['id'] == '') {
-				//echo '<p><a class="refresh" href="javascript:window.location.reload()">'.get_lang('Refresh').'</a></p>';
-			} /*else {
-				if (0) {
-				// if ($_user['user_id'] && $_GET["id"] != $_user['user_id']) {
-					echo '<a href="'.api_get_self().'?chatid='.Security::remove_XSS($_GET['id']).'">'.get_lang('SendChatRequest').'</a>';
-				}
+				echo '<p><a class="refresh" href="javascript:window.location.reload()">'.get_lang('Refresh').'</a></p>';
 			}*/
+			
 		} else {
 			echo '<div class="actions-title">';
 			echo get_lang('UsersOnLineList');
@@ -182,8 +176,6 @@ if ((api_get_setting('showonline', 'world') == 'true' && !$_user['user_id']) ||
 $referer = empty($_GET['referer']) ? 'index.php' : api_htmlentities(strip_tags($_GET['referer']), ENT_QUOTES);
 
 /*
-==============================================================================
 		FOOTER
-==============================================================================
 */
 Display::display_footer();
\ No newline at end of file