diff --git a/main/inc/banner.inc.php b/main/inc/banner.inc.php index 480076b13e..5ea49ff6e3 100755 --- a/main/inc/banner.inc.php +++ b/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 '
  • '.get_lang('UsersConnectedToMySessions').'
    • '; } - $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 ); diff --git a/main/inc/lib/online.inc.php b/main/inc/lib/online.inc.php index 427b08846f..93aeaab08e 100755 --- a/main/inc/lib/online.inc.php +++ b/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()); diff --git a/main/inc/lib/social.lib.php b/main/inc/lib/social.lib.php index e4aa8cc7f5..5c76870b0d 100755 --- a/main/inc/lib/social.lib.php +++ b/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(); @@ -755,10 +755,7 @@ class SocialManager extends UserManager { $name = api_get_person_name($user_info['firstName'], $user_info['lastName']); $table_row[] = ''.$name.''; $table_row[] = ''.api_get_person_name(cut($user_info['firstName'],15), cut($user_info['lastName'],15)).''; - - - //$table_row[] = ''.$user_info['lastName'].''; - + if (api_get_setting('show_email_addresses') == 'true') { $table_row[] = Display::encrypted_mailto_link($user_info['mail']); } @@ -772,7 +769,7 @@ class SocialManager extends UserManager { if (api_get_setting('show_email_addresses') == 'true') { $table_header[] = array(get_lang('Email'), true); } - Display::display_sortable_table($table_header, $table_data, array(), array('per_page' => 30), $extra_params,array(),'grid'); + Display::display_sortable_table($table_header, $table_data, array(), array('per_page' => 30), $extra_params, array(),'grid'); } } /** diff --git a/main/mySpace/myStudents.php b/main/mySpace/myStudents.php index 100ddc2aa3..9e5d69ee05 100755 --- a/main/mySpace/myStudents.php +++ b/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'); diff --git a/main/social/groups.php b/main/social/groups.php index 3a490ecf26..adc1793890 100755 --- a/main/social/groups.php +++ b/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 '
    '; //echo get_lang('Groups'); diff --git a/main/social/home.php b/main/social/home.php index 49c9d89f2a..131025302d 100755 --- a/main/social/home.php +++ b/main/social/home.php @@ -80,6 +80,10 @@ echo '
    '; echo UserManager::get_search_form($query); + $user_list = WhoIsOnline(api_get_setting('time_limit_whosonline')); + + SocialManager::display_user_list($user_list); + echo '
    '; echo '
    '; diff --git a/main/user/userInfo.php b/main/user/userInfo.php index 5dd04508b6..57c0d73266 100755 --- a/main/user/userInfo.php +++ b/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)) { diff --git a/tests/main/inc/lib/online.inc.test.php b/tests/main/inc/lib/online.inc.test.php index 56e13f8675..d3c4ac0ffc 100755 --- a/tests/main/inc/lib/online.inc.test.php +++ b/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); } diff --git a/whoisonline.php b/whoisonline.php index ce24fa122e..e797735992 100755 --- a/whoisonline.php +++ b/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']));