[svn r15194] all the users of the course were listed even if whe choose to display only 20 of them FS#2438

main/inc/lib/course.lib.php

@@ -1071,7 +1071,7 @@ class CourseManager
 	*	@param string $course_code
 	*	@return array with user info
 	*/
-	function get_user_list_from_course_code($course_code, $with_session=true, $session_id=0)
+	function get_user_list_from_course_code($course_code, $with_session=true, $session_id=0, $limit='')
 	{		
 		$session_id = intval($session_id);
 		$a_users = array();		
@@ -1088,6 +1088,8 @@ class CourseManager
 			}
 			$sql_query.=' ORDER BY user.lastname';
 			
+			$sql_query .= ' '.$limit;
+			
 			$rs = api_sql_query($sql_query, __FILE__, __LINE__);
 			
 			while($user = Database::fetch_array($rs))
@@ -1106,7 +1108,9 @@ class CourseManager
 			$table_course_user = Database :: get_main_table(TABLE_MAIN_COURSE_USER);			
 			$sql_query = "SELECT course_user.user_id, user.user_id, course_user.status, course_user.role, course_user.tutor_id " .
 					"FROM $table_course_user as course_user, $table_users as user WHERE `course_code` = '$course_code' AND course_user.user_id = user.user_id ORDER BY user.lastname";
-						
+			
+			$sql_query .= ' '.$limit;
+				
 			$rs = api_sql_query($sql_query, __FILE__, __LINE__);
 			
 			while($user = Database::fetch_array($rs))

main/user/user.php

@@ -469,16 +469,18 @@ function sort_users($a,$b){
 function get_user_data($from, $number_of_items, $column, $direction)
 {
 	$a_users=array();
+	
+	$limit = 'LIMIT '.intval($from).','.intval($number_of_items);
 
 	if(!empty($_SESSION["id_session"])){
 		
-		$a_course_users = CourseManager :: get_user_list_from_course_code($_SESSION['_course']['id'], true, $_SESSION['id_session']);
+		$a_course_users = CourseManager :: get_user_list_from_course_code($_SESSION['_course']['id'], true, $_SESSION['id_session'], $limit);
 	}
 	else
 	{		
-		$a_course_users = CourseManager :: get_user_list_from_course_code($_SESSION['_course']['id'], true);
+		$a_course_users = CourseManager :: get_user_list_from_course_code($_SESSION['_course']['id'], true, 0, $limit);
 	}
-		
+	
 	foreach($a_course_users as $user_id=>$o_course_user)
 	{
 		if( (isset ($_GET['keyword']) && search_keyword($o_course_user['firstname'],$o_course_user['lastname'],$o_course_user['username'],$o_course_user['official_code'],$_GET['keyword'])) || !isset($_GET['keyword']) || empty($_GET['keyword'])){