diff --git a/main/forum/index.php b/main/forum/index.php
index e45e38e70a..afedff7b9a 100644
--- a/main/forum/index.php
+++ b/main/forum/index.php
@@ -30,6 +30,7 @@ $language_file = 'forum';
 // Including the global initialization file.
 require_once '../inc/global.inc.php';
 
+
 $htmlHeadXtra[] = '<script type="text/javascript">
     $(document).ready(function(){ $(\'.hide-me\').slideUp() });
     function hidecontent(content){ $(content).slideToggle(\'normal\'); }
diff --git a/main/inc/global.inc.php b/main/inc/global.inc.php
index 4eaa7c3673..937fb176f3 100644
--- a/main/inc/global.inc.php
+++ b/main/inc/global.inc.php
@@ -62,19 +62,19 @@ if (!$already_installed) {
 // Ensure that _configuration is in the global scope before loading
 // main_api.lib.php. This is particularly helpful for unit tests
 if (!isset($GLOBALS['_configuration'])) {
-  $GLOBALS['_configuration'] = $_configuration;
+    $GLOBALS['_configuration'] = $_configuration;
 }
 
 // Code for trnasitional purposes, it can be removed right before the 1.8.7 release.
 if (empty($_configuration['system_version'])) {
-    $_configuration['system_version'] = $_configuration['dokeos_version'];
-    $_configuration['system_stable'] = $_configuration['dokeos_stable'];
-    $_configuration['software_url'] = 'http://www.chamilo.org/';
+    $_configuration['system_version']   = $_configuration['dokeos_version'];
+    $_configuration['system_stable']    = $_configuration['dokeos_stable'];
+    $_configuration['software_url']     = 'http://www.chamilo.org/';
 }
 
 // For backward compatibility.
-$_configuration['dokeos_version'] = $_configuration['system_version'];
-$_configuration['dokeos_stable'] = $_configuration['system_stable'];
+$_configuration['dokeos_version']       = $_configuration['system_version'];
+$_configuration['dokeos_stable']        = $_configuration['system_stable'];
 
 // Include the main Chamilo platform library file.
 require_once $includePath.'/lib/main_api.lib.php';
@@ -128,10 +128,10 @@ global $database_connection;
 // Connect to the server database and select the main chamilo database.
 if (!($conn_return = @Database::connect(
     array(
-        'server' => $_configuration['db_host'],
-        'username' => $_configuration['db_user'],
-        'password' => $_configuration['db_password'],
-        'persistent' => $_configuration['db_persistent_connection'] // When $_configuration['db_persistent_connection'] is set, it is expected to be a boolean type.
+        'server'        => $_configuration['db_host'],
+        'username'      => $_configuration['db_user'],
+        'password'      => $_configuration['db_password'],
+        'persistent'    => $_configuration['db_persistent_connection'] // When $_configuration['db_persistent_connection'] is set, it is expected to be a boolean type.
     )))) {
     $global_error_code = 3;
     // The database server is not available or credentials are invalid.
@@ -194,6 +194,7 @@ api_set_internationalization_default_encoding($charset);
 // Initialization of the database encoding to be used.
 Database::query("SET SESSION character_set_server='utf8';");
 Database::query("SET SESSION collation_server='utf8_general_ci';");
+
 if (api_is_utf8($charset)) {
     // See Bug #1802: For UTF-8 systems we prefer to use "SET NAMES 'utf8'" statement in order to avoid a bizarre problem with Chinese language.
     Database::query("SET NAMES 'utf8';");
@@ -207,7 +208,7 @@ api_session_start($already_installed);
 // Remove quotes added by PHP  - get_magic_quotes_gpc() is deprecated in PHP 5 see #2970
  
 if (function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc()) {	
-	array_walk_recursive_limited($_GET, 	'stripslashes', true);	
+	array_walk_recursive_limited($_GET,     	'stripslashes', true);	
 	array_walk_recursive_limited($_POST, 	'stripslashes', true);
 	array_walk_recursive_limited($_COOKIE,  'stripslashes', true);
 	array_walk_recursive_limited($_REQUEST, 'stripslashes', true);
diff --git a/main/inc/local.inc.php b/main/inc/local.inc.php
index 91e17f7ec6..89c2aed98d 100644
--- a/main/inc/local.inc.php
+++ b/main/inc/local.inc.php
@@ -614,10 +614,10 @@ if ($gidReq && $gidReq != $gid) {
 
 /* USER INIT */
   
-  if (isset($uidReset) && $uidReset) {    // session data refresh requested
-      unset($_SESSION['_user']['uidReset']);
-      $is_platformAdmin = false; 
-      $is_allowedCreateCourse = false;
+if (isset($uidReset) && $uidReset) {    // session data refresh requested
+    unset($_SESSION['_user']['uidReset']);
+    $is_platformAdmin = false; 
+    $is_allowedCreateCourse = false;
 
 	if (isset($_user['user_id']) && $_user['user_id'] && ! api_is_anonymous()) {
         // a uid is given (log in succeeded)
@@ -691,7 +691,8 @@ if ($gidReq && $gidReq != $gid) {
 
 /*  COURSE INIT */
 
-if (isset($cidReset) && $cidReset) { // course session data refresh requested or empty data    
+if (isset($cidReset) && $cidReset) {
+    // Course session data refresh requested or empty data        
 	if ($cidReq) {
 		$course_table = Database::get_main_table(TABLE_MAIN_COURSE);
 		$course_cat_table = Database::get_main_table(TABLE_MAIN_CATEGORY);
@@ -706,7 +707,7 @@ if (isset($cidReset) && $cidReset) { // course session data refresh requested or
 			$course_data = Database::fetch_array($result);
 			//@TODO real_cid should be cid, for working with numeric course id
 			$_real_cid                      = $course_data['id'];
-
+			
 			$_cid                           = $course_data['code'];
 			$_course = array();
 			$_course['real_id']             = $course_data['id'];
@@ -783,13 +784,14 @@ if (isset($cidReset) && $cidReset) { // course session data refresh requested or
             api_session_unregister('session_name');
         }   
     }
-} else { // continue with the previous values
+} else {
+    // Continue with the previous values    
     if (empty($_SESSION['_course']) OR empty($_SESSION['_cid'])) { //no previous values...
         $_cid         = -1;        //set default values that will be caracteristic of being unset
         $_course      = -1;
     } else {
-        $_cid         = $_SESSION['_cid'   ];
-           $_course   = $_SESSION['_course'];
+        $_cid      = $_SESSION['_cid'   ];
+        $_course   = $_SESSION['_course'];
 
            // these lines are usefull for tracking. Indeed we can have lost the id_session and not the cid.
            // Moreover, if we want to track a course with another session it can be usefull        
@@ -1021,10 +1023,7 @@ if ((isset($uidReset) && $uidReset) || (isset($cidReset) && $cidReset)) { // ses
         $is_sessionAdmin     = false;
         api_session_unregister('_courseUser');
     }
-
-	//DEPRECATED
-	//$is_courseAllowed=($_cid && ($_course['visibility'] || $is_courseMember || $is_platformAdmin))?true:false;
-
+    
 	//NEW
 	if (isset($_course)) {
 		if ($_course['visibility'] == COURSE_VISIBILITY_OPEN_WORLD)
@@ -1058,7 +1057,6 @@ if ((isset($uidReset) && $uidReset) || (isset($cidReset) && $cidReset)) { // ses
                 //checking date
 			}
         }
-
 	}
 
 	// save the states
@@ -1069,7 +1067,7 @@ if ((isset($uidReset) && $uidReset) || (isset($cidReset) && $cidReset)) { // ses
 	api_session_register('is_courseTutor');
 	api_session_register('is_allowed_in_course'); //new permission var
 	api_session_register('is_courseCoach');
-	api_session_register('is_sessionAdmin');
+	api_session_register('is_sessionAdmin');    
 } else { // continue with the previous values
 
 	if (isset($_SESSION ['_courseUser'])) {