From d7858ccfc1b0f106a029590feeb675edabe6d4b3 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Tue, 7 Aug 2012 17:40:27 +0200 Subject: [PATCH] Fixing whoisonline listing --- main/inc/ajax/online.ajax.php | 10 ++++++---- main/inc/lib/online.inc.php | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/main/inc/ajax/online.ajax.php b/main/inc/ajax/online.ajax.php index 67999d16a2..e7da0fe756 100644 --- a/main/inc/ajax/online.ajax.php +++ b/main/inc/ajax/online.ajax.php @@ -15,15 +15,17 @@ switch($action) { } else { $_SESSION['who_is_online_counter'] = 2; } + $images_to_show = 9; + $page = intval($_REQUEST['online_page_nr']); - $max_page = round(who_is_online_count()/10); - $page_rows = $page*10; + $max_page = round(who_is_online_count()/$images_to_show); + $page_rows = ($page-1)*9 + 1; if (!empty($max_page) && $page <= $max_page) { if (isset($_GET['cidReq']) && strlen($_GET['cidReq']) > 0) { - $user_list = who_is_online_in_this_course($page_rows, 10, api_get_user_id(), api_get_setting('time_limit_whosonline'), $_GET['cidReq']); + $user_list = who_is_online_in_this_course($page_rows, $images_to_show, api_get_user_id(), api_get_setting('time_limit_whosonline'), $_GET['cidReq']); } else { - $user_list = who_is_online($page_rows, 10); + $user_list = who_is_online($page_rows, $images_to_show); } if (!empty($user_list)) { echo SocialManager::display_user_list($user_list); diff --git a/main/inc/lib/online.inc.php b/main/inc/lib/online.inc.php index 0db2b15466..00ddb2cd9c 100644 --- a/main/inc/lib/online.inc.php +++ b/main/inc/lib/online.inc.php @@ -280,7 +280,7 @@ function who_is_online_count($valid = null, $friends = false) { WHERE track.access_url_id = $access_url_id AND DATE_ADD(login_date,INTERVAL $valid MINUTE) >= '".$current_date."' AND friend_user_id <> '".api_get_user_id()."' AND relation_type='".USER_RELATION_TYPE_FRIEND."' "; } else { // all users online - $query = "SELECT count(login_id) as count FROM ".$track_online_table ." track + $query = "SELECT count(login_id) as count FROM $track_online_table track WHERE login_user_id <> 2 AND track.access_url_id = $access_url_id AND DATE_ADD(login_date,INTERVAL $valid MINUTE) >= '".$current_date."' "; } }