diff --git a/main/admin/special_exports.php b/main/admin/special_exports.php
index aefeb79278..b9bacfccbf 100755
--- a/main/admin/special_exports.php
+++ b/main/admin/special_exports.php
@@ -46,7 +46,7 @@ $tbl_session_course = Database::get_main_table(TABLE_MAIN_SESSION_COURSE);
 if ((isset($_POST['action']) && $_POST['action'] == 'course_select_form') ||
     (isset($_POST['backup_option']) && $_POST['backup_option'] == 'full_backup')
 ) {
-	$export = false;
+    $export = false;
     if (isset($_POST['action']) && $_POST['action'] == 'course_select_form') {
         $FileZip = create_zip();
         $to_group_id = 0;
@@ -269,10 +269,10 @@ function fullexportspecial()
 
             //Add tem to the zip file session course
             $sql = "SELECT s.id, name, c_id
-                            FROM $tbl_session_course sc
-                            INNER JOIN $tbl_session  s
-                            ON sc.session_id = s.id
-                            WHERE c_id = '$course_id' ";
+                    FROM $tbl_session_course sc
+                    INNER JOIN $tbl_session s
+                    ON sc.session_id = s.id
+                    WHERE c_id = '$course_id' ";
             $query_session = Database::query($sql);
             while ($rows_session = Database::fetch_assoc($query_session)) {
                 $session_id = $rows_session['id'];
diff --git a/main/admin/user_information.php b/main/admin/user_information.php
index 59dca79bb6..0f844c643a 100755
--- a/main/admin/user_information.php
+++ b/main/admin/user_information.php
@@ -248,13 +248,6 @@ foreach ($data as $label => $item) {
     $row++;
 }
 $trackingInformation = $table->toHtml();
-
-$tbl_session_course = Database::get_main_table(TABLE_MAIN_SESSION_COURSE);
-$tbl_session_course_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
-$tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
-$tbl_course = Database::get_main_table(TABLE_MAIN_COURSE);
-$tbl_user = Database::get_main_table(TABLE_MAIN_USER);
-
 $socialInformation = '';
 
 /**
diff --git a/main/coursecopy/copy_course_session_selected.php b/main/coursecopy/copy_course_session_selected.php
index 93fe90ff28..6352aa43af 100644
--- a/main/coursecopy/copy_course_session_selected.php
+++ b/main/coursecopy/copy_course_session_selected.php
@@ -35,7 +35,7 @@ $courseInfo = api_get_course_info_by_id($courseId);
 $courseCode = $courseInfo['code'];
 $sessionId = api_get_session_id();
 
-if (empty($courseCode) OR empty($sessionId)) {
+if (empty($courseCode) || empty($sessionId)) {
     api_not_allowed(true);
 }
 
@@ -58,18 +58,14 @@ $tbl_session_rel_course_rel_user = Database::get_main_table(
     TABLE_MAIN_SESSION_COURSE_USER
 );
 $tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
-$tbl_session_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_USER);
-$tbl_session_rel_course = Database::get_main_table(TABLE_MAIN_SESSION_COURSE);
 $tbl_course = Database::get_main_table(TABLE_MAIN_COURSE);
 
 /* FUNCTIONS */
-
 /**
  * @param string $name
  */
 function make_select_session_list($name, $sessions, $attr = array())
 {
-
     $attrs = '';
     if (count($attr) > 0) {
         foreach ($attr as $key => $value) {
diff --git a/main/inc/lib/login.lib.php b/main/inc/lib/login.lib.php
index 29298e3387..fa6e3971f6 100755
--- a/main/inc/lib/login.lib.php
+++ b/main/inc/lib/login.lib.php
@@ -615,7 +615,6 @@ class Login
                         // The user is subscribed in a session? The user is a Session coach a Session admin ?
 
                         $tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
-                        $tbl_session_course = Database::get_main_table(TABLE_MAIN_SESSION_COURSE);
                         $tbl_session_course_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
 
                         //Session coach, session admin, course coach admin
diff --git a/main/inc/local.inc.php b/main/inc/local.inc.php
index e5fc2bb5c9..4c79424262 100755
--- a/main/inc/local.inc.php
+++ b/main/inc/local.inc.php
@@ -1227,7 +1227,8 @@ if ((isset($uidReset) && $uidReset) || (isset($cidReset) && $cidReset)) {
                     $is_sessionAdmin     = true;
                 } else {
                     // Am I a session coach for this session?
-                    $sql = "SELECT session.id, session.id_coach FROM $tbl_session session
+                    $sql = "SELECT session.id, session.id_coach 
+                            FROM $tbl_session session
                             INNER JOIN $tbl_session_course sc
                             ON sc.session_id = session.id
                             WHERE session.id = $session_id
diff --git a/whoisonlinesession.php b/whoisonlinesession.php
index f0ac0de856..97390e2e78 100755
--- a/whoisonlinesession.php
+++ b/whoisonlinesession.php
@@ -9,7 +9,6 @@ include_once './main/inc/global.inc.php';
 api_block_anonymous_users();
 
 $tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
-$tbl_session_course = Database::get_main_table(TABLE_MAIN_SESSION_COURSE);
 $tbl_session_course_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
 
 /**
@@ -21,123 +20,124 @@ Display::display_header(get_lang('UserOnlineListSession'));
 ?>
 <br /><br />
 <table class="data_table" width="60%">
-	<tr class="tableName">
-		<td colspan="4">
-			<strong><?php echo get_lang('UserOnlineListSession'); ?></strong>
-		</td>
-	</tr>
-	<tr>
-		<th>
-			<?php echo get_lang('Name'); ?>
-		</th>
-		<th>
-			<?php echo get_lang('InCourse'); ?>
-		</th>
-		<th>
-			<?php echo get_lang('Email'); ?>
-		</th>
-		<th>
-			<?php echo get_lang('Chat'); ?>
-		</th>
-	</tr>
+    <tr class="tableName">
+        <td colspan="4">
+            <strong><?php echo get_lang('UserOnlineListSession'); ?></strong>
+        </td>
+    </tr>
+    <tr>
+        <th>
+            <?php echo get_lang('Name'); ?>
+        </th>
+        <th>
+            <?php echo get_lang('InCourse'); ?>
+        </th>
+        <th>
+            <?php echo get_lang('Email'); ?>
+        </th>
+        <th>
+            <?php echo get_lang('Chat'); ?>
+        </th>
+    </tr>
 <?php
-    $session_is_coach = array();
-    if (isset($_user['user_id']) && $_user['user_id'] != '') {
-        $_user['user_id'] = intval($_user['user_id']);
-        $sql = "SELECT DISTINCT session.id,
-					name,
-					access_start_date,
-					access_end_date
-				FROM $tbl_session as session
-				INNER JOIN $tbl_session_course_user as srcru
-					ON srcru.user_id = ".$_user['user_id']." AND srcru.status=2
-					AND session.id = srcru.session_id
-				ORDER BY access_start_date, access_end_date, name";
-        $result = Database::query($sql);
-
-        while ($session = Database:: fetch_array($result)) {
-            $session_is_coach[$session['id']] = $session;
-        }
+$session_is_coach = array();
 
-        $sql = "SELECT DISTINCT session.id,
-					name,
-					access_start_date,
-					access_end_date
-				FROM $tbl_session as session
-				WHERE session.id_coach = ".$_user['user_id']."
-				ORDER BY access_start_date, access_end_date, name";
-        $result = Database::query($sql);
-        while ($session = Database:: fetch_array($result)) {
-            $session_is_coach[$session['id']] = $session;
-        }
+if (isset($_user['user_id']) && $_user['user_id'] != '') {
+    $_user['user_id'] = intval($_user['user_id']);
+    $sql = "SELECT DISTINCT session.id,
+                name,
+                access_start_date,
+                access_end_date
+            FROM $tbl_session as session
+            INNER JOIN $tbl_session_course_user as srcru
+            ON 
+                srcru.user_id = ".$_user['user_id']." AND 
+                srcru.status=2 AND 
+                session.id = srcru.session_id
+            ORDER BY access_start_date, access_end_date, name";
+    $result = Database::query($sql);
 
-        if (empty($time_limit)) {
-            $time_limit = api_get_setting('time_limit_whosonline');
-        } else {
-            $time_limit = 60;
-        }
+    while ($session = Database:: fetch_array($result)) {
+        $session_is_coach[$session['id']] = $session;
+    }
 
-        $online_time    = time() - $time_limit * 60;
-        $current_date   = api_get_utc_datetime($online_time);
+    $sql = "SELECT DISTINCT session.id,
+                name,
+                access_start_date,
+                access_end_date
+            FROM $tbl_session as session
+            WHERE session.id_coach = ".$_user['user_id']."
+            ORDER BY access_start_date, access_end_date, name";
+    $result = Database::query($sql);
+    while ($session = Database:: fetch_array($result)) {
+        $session_is_coach[$session['id']] = $session;
+    }
 
-        $students_online = array();
-        foreach ($session_is_coach as $session) {
-            $sql = "SELECT DISTINCT last_access.access_user_id,
-						last_access.access_date,
-						last_access.c_id,
-						last_access.access_session_id,
-						".(api_is_western_name_order() ? "CONCAT(user.firstname,' ',user.lastname)" : "CONCAT(user.lastname,' ',user.firstname)")." as name,
-						user.email
-					FROM ".Database::get_main_table(TABLE_STATISTIC_TRACK_E_LASTACCESS)." AS last_access
-					INNER JOIN ".Database::get_main_table(TABLE_MAIN_USER)." AS user
-						ON user.user_id = last_access.access_user_id
-					WHERE access_session_id='".$session['id']."'
-					AND access_date >= '$current_date'
-					GROUP BY access_user_id";
+    if (empty($time_limit)) {
+        $time_limit = api_get_setting('time_limit_whosonline');
+    } else {
+        $time_limit = 60;
+    }
 
-            $result = Database::query($sql);
+    $online_time = time() - $time_limit * 60;
+    $current_date = api_get_utc_datetime($online_time);
+    $students_online = array();
+    foreach ($session_is_coach as $session) {
+        $sql = "SELECT DISTINCT last_access.access_user_id,
+                    last_access.access_date,
+                    last_access.c_id,
+                    last_access.access_session_id,
+                    ".(api_is_western_name_order() ? "CONCAT(user.firstname,' ',user.lastname)" : "CONCAT(user.lastname,' ',user.firstname)")." as name,
+                    user.email
+                FROM ".Database::get_main_table(TABLE_STATISTIC_TRACK_E_LASTACCESS)." AS last_access
+                INNER JOIN ".Database::get_main_table(TABLE_MAIN_USER)." AS user
+                    ON user.user_id = last_access.access_user_id
+                WHERE access_session_id='".$session['id']."'
+                AND access_date >= '$current_date'
+                GROUP BY access_user_id";
 
-            while ($user_list = Database::fetch_array($result)) {
-                $students_online[$user_list['access_user_id']] = $user_list;
-            }
+        $result = Database::query($sql);
+        while ($user_list = Database::fetch_array($result)) {
+            $students_online[$user_list['access_user_id']] = $user_list;
         }
+    }
 
-        if (count($students_online) > 0) {
-            foreach ($students_online as $student_online) {
-                echo "<tr>
-						<td>
-					";
-                echo $student_online['name'];
-                echo "	</td>
-						<td align='center'>
-					 ";
-                $courseInfo = api_get_course_info_by_id($student_online['c_id']);
-                echo $courseInfo['title'];
-                echo "	</td>
-						<td align='center'>
-					 ";
-                                if (!empty($student_online['email'])) {
-                                echo $student_online['email'];
-                                } else {
-                                    echo get_lang('NoEmail');
-                                }
-                echo "	</td>
-						<td align='center'>
-					 ";
-                echo '<a href="main/chat/chat.php?cidReq='.$courseInfo['code'].'&id_session='.$student_online['access_session_id'].'"> -> </a>';
-                echo "	</td>
-					</tr>
-					 ";
+    if (count($students_online) > 0) {
+        foreach ($students_online as $student_online) {
+            echo "<tr>
+                    <td>
+                ";
+            echo $student_online['name'];
+            echo "	</td>
+                    <td align='center'>
+                 ";
+            $courseInfo = api_get_course_info_by_id($student_online['c_id']);
+            echo $courseInfo['title'];
+            echo "	</td>
+                    <td align='center'>
+                 ";
+            if (!empty($student_online['email'])) {
+                echo $student_online['email'];
+            } else {
+                echo get_lang('NoEmail');
             }
-        } else {
-            echo '	<tr>
-						<td colspan="4">
-							'.get_lang('NoOnlineStudents').'
-						</td>
-					</tr>
-				 ';
+            echo "	</td>
+                    <td align='center'>
+                 ";
+            echo '<a href="main/chat/chat.php?cidReq='.$courseInfo['code'].'&id_session='.$student_online['access_session_id'].'"> -> </a>';
+            echo "	</td>
+                </tr>
+                 ";
         }
+    } else {
+        echo '	<tr>
+                    <td colspan="4">
+                        '.get_lang('NoOnlineStudents').'
+                    </td>
+                </tr>
+             ';
     }
+}
 ?>
 </table>
 <?php