Fixing whoisonline function

main/inc/banner.inc.php

@@ -105,7 +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>';
 	}
-	$number = count(WhoIsOnline(api_get_user_id(), api_get_setting('time_limit_whosonline')));
+	$number = count(WhoIsOnline(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

@@ -121,11 +121,10 @@ function LoginDelete($user_id)
 
 /**
  * Gives a list of people online now (and in the last $valid minutes)
- * @param   int User ID - 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
  */
-function WhoIsOnline($uid=0, $valid)
+function WhoIsOnline($valid)
 {
 	$valid = (int) $valid;
 	$current_date=date('Y-m-d H:i:s',time());

main/inc/lib/social.lib.php

@@ -729,7 +729,7 @@ class SocialManager extends UserManager {
 	 * Displays a sortable table with the list of online users.
 	 * @param array $user_list
 	 */
-	function display_user_list($user_list, $_plugins) {
+	function display_user_list($user_list) {
 		global $charset;
 		if ($_GET['id'] == '') {
 			$extra_params = array();
@@ -756,9 +756,6 @@ class SocialManager extends UserManager {
 				$table_row[] = '<a href="'.$url.'"><img title = "'.$name.'" alt="'.$name.'" src="'.$friends_profile['file'].'" '.$friends_profile['style'].' border="1"></a>';
 				$table_row[] = '<a href="'.$url.'" style="font-size:10px;">'.api_get_person_name(cut($user_info['firstName'],15), cut($user_info['lastName'],15)).'</a>';
 
-	
-				//$table_row[] = '<a href="'.$url.'">'.$user_info['lastName'].'</a>';
-	
 				if (api_get_setting('show_email_addresses') == 'true') {
 					$table_row[] = Display::encrypted_mailto_link($user_info['mail']);
 				}

main/mySpace/myStudents.php

@@ -240,7 +240,7 @@ if (!empty ($_GET['student'])) {
 
 	// is the user online ?	
 	$student_online = Security :: remove_XSS($_GET['student']);
-	$users_online = WhoIsOnline($student_online, 30);
+	$users_online = WhoIsOnline(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(), api_get_setting('time_limit_whosonline')));
+$who_is_on_line = get_lang('UsersOnline').' '.count(WhoIsOnline(api_get_setting('time_limit_whosonline')));
 
 echo '<div class="actions-title-groups">';
 //echo get_lang('Groups');

main/social/home.php

@@ -80,6 +80,10 @@ echo '<div id="social_wrapper">';
 				
 				echo UserManager::get_search_form($query);
 				
+				$user_list = WhoIsOnline(api_get_setting('time_limit_whosonline'));	
+				
+				SocialManager::display_user_list($user_list);
+			
 			
 				echo '<div id="social_center">';
 				echo '</div>';	

main/user/userInfo.php

@@ -478,7 +478,7 @@ elseif ($displayMode == "viewContentList") // default display
 		}
 
 		// is the user online ?			
-		$users_online = WhoIsOnline($userIdViewed, 30);
+		$users_online = WhoIsOnline(30);
 		foreach ($users_online as $online) {
 			if (in_array($userIdViewed, $online)) {	
 				

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

@@ -92,7 +92,7 @@ class TestOnline extends UnitTestCase {
 
 	function testWhoIsOnline()  {		
 		$valid='';
-		$res=WhoIsOnline($uid=0,$valid);
+		$res=WhoIsOnline($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'], api_get_setting('time_limit_whosonline'));
+		$user_list = WhoIsOnline(api_get_setting('time_limit_whosonline'));
 	}
 
 	$total = count($user_list);
@@ -148,7 +148,7 @@ if ((api_get_setting('showonline', 'world') == 'true' && !$_user['user_id']) ||
 		if (!isset($_GET['id'])) {
 			if (!api_is_anonymous())
 				echo UserManager::get_search_form($_GET['q']);				
-			SocialManager::display_user_list($user_list, $_plugins);
+			SocialManager::display_user_list($user_list);
 		} else {
 			//individual user information - also displays header info
 			SocialManager::display_individual_user(Security::remove_XSS($_GET['id']));