Fixing whoisonline function

main/inc/banner.inc.php

@@ -105,9 +105,7 @@ if ((api_get_setting('showonline','world') == "true" AND !$_user['user_id']) OR
 	if (api_get_setting("use_session_mode") == "true" && isset($_user['user_id']) && api_is_coach()) {
 	    echo '  <li><a href="'.api_get_path(WEB_PATH).'whoisonlinesession.php?id_coach='.$_user['user_id'].'&amp;referer='.urlencode($_SERVER['REQUEST_URI']).'" target="_top">'.get_lang('UsersConnectedToMySessions').'</a></li>';
 	}
-
-	$statistics_database = Database :: get_statistic_database();
-	$number = count(WhoIsOnline(api_get_user_id(), $statistics_database, api_get_setting('time_limit_whosonline')));
+	$number = count(WhoIsOnline(api_get_user_id(), api_get_setting('time_limit_whosonline')));
 	if(!empty($_course['id'])) {
 		$online_in_course = who_is_online_in_this_course(api_get_user_id(), api_get_setting('time_limit_whosonline'), $_course['id']);
 		$number_online_in_course= count( $online_in_course );

main/inc/lib/online.inc.php

@@ -145,9 +145,8 @@ function LoginDelete($user_id)
  * @param   string      Statistics database name - useless
  * @param   int         Number of minutes to account logins for
  * @return  array       For each line, a list of user IDs and login dates, or FALSE on error or empty results
- * @todo remove parameter $statistics_database which is no longer necessary
  */
-function WhoIsOnline($uid=0,$statistics_database='',$valid)
+function WhoIsOnline($uid=0, $valid)
 {
 	$valid = (int) $valid;
 	$current_date=date('Y-m-d H:i:s',time());

main/mySpace/myStudents.php

@@ -238,10 +238,9 @@ if (!empty ($_GET['student'])) {
 	}
 	echo '</div>';
 
-	// is the user online ?
-	$statistics_database = Database :: get_statistic_database();
+	// is the user online ?	
 	$student_online = Security :: remove_XSS($_GET['student']);
-	$users_online = WhoIsOnline($student_online, $statistics_database, 30);
+	$users_online = WhoIsOnline($student_online, 30);
 	foreach ($users_online as $online) {
 		if (in_array($_GET['student'], $online)) {
 			$online = get_lang('Yes');

main/social/groups.php

@@ -134,7 +134,7 @@ if (isset($_POST['token']) && $_POST['token'] === $_SESSION['sec_token']) {
 // getting group information
 $group_id	= intval($_GET['id']);
 
-$who_is_on_line = get_lang('UsersOnline').' '.count(WhoIsOnline(api_get_user_id(), $statistics_database, api_get_setting('time_limit_whosonline')));
+$who_is_on_line = get_lang('UsersOnline').' '.count(WhoIsOnline(api_get_user_id(), api_get_setting('time_limit_whosonline')));
 
 echo '<div class="actions-title-groups">';
 //echo get_lang('Groups');

main/user/userInfo.php

@@ -477,9 +477,8 @@ elseif ($displayMode == "viewContentList") // default display
 		echo '<input type="image" src="'.$image_array['dir'].$image_array['file'].'" onclick="return show_image(\''.$url_big_image.'\',\''.$big_image_width.'\',\''.$big_image_height.'\');"/>';
 		}
 
-		// is the user online ?
-		$statistics_database = Database :: get_statistic_database();	
-		$users_online = WhoIsOnline($userIdViewed, $statistics_database, 30);
+		// is the user online ?			
+		$users_online = WhoIsOnline($userIdViewed, 30);
 		foreach ($users_online as $online) {
 			if (in_array($userIdViewed, $online)) {	
 				

tests/main/inc/lib/online.inc.test.php

@@ -90,10 +90,9 @@ class TestOnline extends UnitTestCase {
 		//var_dump($rarray);
 	}
 
-	function testWhoIsOnline()  {
-		$statistics_database='';
+	function testWhoIsOnline()  {		
 		$valid='';
-		$res=WhoIsOnline($uid=0,$statistics_database='',$valid);
+		$res=WhoIsOnline($uid=0,$valid);
 		$this->assertTrue(is_array($res));
 		//var_dump($res);
 	}

whoisonline.php

@@ -120,7 +120,7 @@ if ((api_get_setting('showonline', 'world') == 'true' && !$_user['user_id']) ||
 	if(isset($_GET['cidReq']) && strlen($_GET['cidReq']) > 0) {
 		$user_list = Who_is_online_in_this_course($_user['user_id'], api_get_setting('time_limit_whosonline'), $_GET['cidReq']);
 	} else {
-		$user_list = WhoIsOnline($_user['user_id'], $_configuration['statistics_database'], api_get_setting('time_limit_whosonline'));
+		$user_list = WhoIsOnline($_user['user_id'], api_get_setting('time_limit_whosonline'));
 	}
 
 	$total = count($user_list);