Fix whoisonline page see BT#11869

app/Resources/public/css/base.css

@@ -188,7 +188,7 @@ header{
   background: #2C5B8E;
 }
 .carousel-control{
- width: 5%;   
+ width: 5%;
 }
 .carousel-content .block-text{
     padding-left: 7%;
@@ -5359,6 +5359,7 @@ div#chat-remote-video video {
 }
 #whoisonline .items-user-avatar .img-responsive{
     display: inline-block;
+    height: 128px;
 }
 #whoisonline .items-user-name{
   font-size: 12px;

main/inc/ajax/online.ajax.php

@@ -6,9 +6,7 @@ $action = $_GET['a'];
 
 switch ($action) {
     case 'load_online_user':
-
         $images_to_show = MAX_ONLINE_USERS;
-
         $page = intval($_REQUEST['online_page_nr']);
         $max_page = ceil(who_is_online_count()/$images_to_show);
 

main/inc/lib/api.lib.php

@@ -607,11 +607,10 @@ define('RESOURCE_ATTENDANCE', 'attendance');
 define('RESOURCE_WORK', 'work');
 define('RESOURCE_SESSION_COURSE', 'session_course');
 define('RESOURCE_GRADEBOOK', 'gradebook');
-
 define('ADD_THEMATIC_PLAN', 6);
 
-// Max online users to show per page
-define('MAX_ONLINE_USERS', 8);
+// Max online users to show per page (whoisonline)
+define('MAX_ONLINE_USERS', 12);
 
 // Make sure the CHAMILO_LOAD_WYSIWYG constant is defined
 // To remove CKeditor libs from HTML, set this constant to true before loading

main/inc/lib/online.inc.php

@@ -300,7 +300,8 @@ function who_is_online($from, $number_of_items, $column = null, $direction = nul
     }
 
 	//This query will show all registered users. Only for dev purposes.
-	/*$query = "SELECT DISTINCT u.id as login_user_id, login_date FROM ".$track_online_table ."  e , $table_user u
+	/*$query = "SELECT DISTINCT u.id as login_user_id, login_date
+	        FROM $track_online_table e, $table_user u
             GROUP by u.id
             ORDER BY $column $direction
             LIMIT $from, $number_of_items";*/

main/template/default/social/whoisonline.tpl

@@ -3,6 +3,7 @@
 {% block content %}
     <div class="row">
         <div class="col-md-12">
+            {% if social_search %}
             <div class="search-user">
                 <div class="panel panel-default">
                     <div class="panel-heading">
@@ -13,6 +14,7 @@
                     </div>
                 </div>
             </div>
+            {% endif %}
             <div id="whoisonline">
                 <div id="user-list" class="row">
                     {{ whoisonline }}
@@ -29,7 +31,7 @@
                 page = $("#link_load_more_items").attr("data_link");
                 $.ajax({
                     beforeSend: function() {
-                        $("#link_load_more_items").html("{{ 'Loading' | get_lang }} <em class='fa fa-spinner fa-pulse fa-fw'></em>");
+                        $("#link_load_more_items").html("{{ 'Loading' | get_lang|escape('js') }} <em class='fa fa-spinner fa-pulse fa-fw'></em>");
                     },
                     type: "GET",
                     url: "main/inc/ajax/online.ajax.php?a=load_online_user",
@@ -38,7 +40,7 @@
                         if (data != "end") {
                             $("#link_load_more_items").attr("data_link", parseInt(page) + 1);
                             $("#user-list").append(data);
-                            $("#link_load_more_items").html("{{ 'More' | get_lang }}");
+                            $("#link_load_more_items").html("{{ 'More' | get_lang|escape('js')}}");
                         } else {
                             $("#link_load_more_items").remove();
                         }

whoisonline.php

@@ -16,19 +16,22 @@ if (isset($_GET['cidReq']) && strlen($_GET['cidReq']) > 0) {
 }
 
 $this_section = SECTION_SOCIAL;
-// table definitions
-
-$social_right_content = null;
-$whoisonline_list = null;
+$social_right_content = '';
+$whoisonline_list = '';
 $social_search = '';
 
 // This if statement prevents users accessing the who's online feature when it has been disabled.
 if ((api_get_setting('showonline', 'world') == 'true' && !$_user['user_id']) ||
     ((api_get_setting('showonline', 'users') == 'true' || api_get_setting('showonline', 'course') == 'true') && $_user['user_id'])
 ) {
-
     if (isset($_GET['cidReq']) && strlen($_GET['cidReq']) > 0) {
-        $user_list = who_is_online_in_this_course(0, MAX_ONLINE_USERS, api_get_user_id(), api_get_setting('time_limit_whosonline'), $_GET['cidReq']);
+        $user_list = who_is_online_in_this_course(
+            0,
+            MAX_ONLINE_USERS,
+            api_get_user_id(),
+            api_get_setting('time_limit_whosonline'),
+            $_GET['cidReq']
+        );
     } else {
         $user_list = who_is_online(0, MAX_ONLINE_USERS);
     }
@@ -47,7 +50,6 @@ if ((api_get_setting('showonline', 'world') == 'true' && !$_user['user_id']) ||
 
     $whoisonline_list .= SocialManager::display_user_list($user_list);
 
-
     if (isset($_GET['id'])) {
         if (api_get_setting('allow_social_tool') == 'true' && api_user_is_login()) {
             header("Location: ".api_get_path(WEB_CODE_PATH)."social/profile.php?u=".intval($_GET['id']));
@@ -63,14 +65,12 @@ if ((api_get_setting('showonline', 'world') == 'true' && !$_user['user_id']) ||
 
 $tpl = new Template(get_lang('UsersOnLineList'));
 
-if (api_get_setting('allow_social_tool') == 'true' && !api_is_anonymous()) {
+if (api_get_setting('allow_social_tool') === 'true' && !api_is_anonymous()) {
     $tpl->assign('whoisonline', $whoisonline_list);
     $tpl->assign('social_search', $social_search);
-    $social_layout = $tpl->get_template('social/whoisonline.tpl');
-    $tpl->display($social_layout);
 } else {
-    $content = $social_right_content;
-    $tpl->assign('header', get_lang('UsersOnLineList'));
-    $tpl->assign('content', $content);
-    $tpl->display_one_col_template();
+    $tpl->assign('whoisonline', $social_right_content);
 }
+
+$social_layout = $tpl->get_template('social/whoisonline.tpl');
+$tpl->display($social_layout);