From 4d970551d9f950d75fb2b145fbc20493427bf1af Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Tue, 11 Aug 2015 14:55:26 +0200
Subject: [PATCH] Fix social chat message warning.

---
 main/inc/lib/javascript/chat/js/chat.js    | 186 ++++++++++-----------
 main/inc/lib/social.lib.php                |   6 +-
 main/social/profile.php                    |  56 ++++---
 main/template/default/layout/page_body.tpl |   1 +
 4 files changed, 129 insertions(+), 120 deletions(-)

diff --git a/main/inc/lib/javascript/chat/js/chat.js b/main/inc/lib/javascript/chat/js/chat.js
index 945b16cef3..58daf31591 100755
--- a/main/inc/lib/javascript/chat/js/chat.js
+++ b/main/inc/lib/javascript/chat/js/chat.js
@@ -331,10 +331,10 @@ function chatWith(user_id, user_name, status) {
 }
 
 function chatNotYetWith(message) {
-    $("#message_ajax_reponse").html(message);
-    $("#message_ajax_reponse").css('display', 'block');
-    $("#message_ajax_reponse").attr('class', 'alert');
-    $('#message_ajax_reponse').alert()
+    $("#js_alerts").html(message);
+    $("#js_alerts").css('display', 'block');
+    $("#js_alerts").attr('class', 'alert alert-warning');
+    $('#js_alerts').alert()
 }
 
 /**
@@ -352,99 +352,99 @@ function createChatBox(user_id, chatboxtitle, minimizeChatBox, online) {
 
 	user_is_online = return_online_user(user_id, online);
 
-        var chatbox = $('<div>')
-            .attr({
-                id: 'chatbox_' + user_id
-            })
-            .addClass('chatbox')
-            .css('bottom', 0);
-
-        var chatboxHead = $('<div>')
-            .addClass('chatboxhead')
-            .append(user_is_online);
-
-        $('<div>')
-            .addClass('chatboxtitle')
-            .append(chatboxtitle)
-            .appendTo(chatboxHead);
-
-        var chatboxoptions = $('<div>')
-            .addClass('chatboxoptions')
-            .appendTo(chatboxHead);
-
-        if (!!Modernizr.prefixed('RTCPeerConnection', window)) {
-            $('<a>')
-                .addClass('btn btn-xs')
-                .attr({
-                    href: '#'
-                })
-                .html('<i class="fa fa-video-camera"></i>')
-                .on('click', function(e) {
-                    e.preventDefault();
-
-                    var createForm = $.get(
-                        ajax_url,
-                        {
-                            action: 'start_video',
-                            to: user_id
-                        }
-                    );
+	var chatbox = $('<div>')
+		.attr({
+			id: 'chatbox_' + user_id
+		})
+		.addClass('chatbox')
+		.css('bottom', 0);
+
+	var chatboxHead = $('<div>')
+		.addClass('chatboxhead')
+		.append(user_is_online);
+
+	$('<div>')
+		.addClass('chatboxtitle')
+		.append(chatboxtitle)
+		.appendTo(chatboxHead);
+
+	var chatboxoptions = $('<div>')
+		.addClass('chatboxoptions')
+		.appendTo(chatboxHead);
+
+	if (!!Modernizr.prefixed('RTCPeerConnection', window)) {
+		$('<a>')
+			.addClass('btn btn-xs')
+			.attr({
+				href: '#'
+			})
+			.html('<i class="fa fa-video-camera"></i>')
+			.on('click', function(e) {
+				e.preventDefault();
+
+				var createForm = $.get(
+					ajax_url,
+					{
+						action: 'start_video',
+						to: user_id
+					}
+				);
 
-                    $.when(createForm).done(function(response) {
-                        $('#global-modal')
-                            .find('.modal-dialog')
-                            .removeClass('modal-lg');
+				$.when(createForm).done(function(response) {
+					$('#global-modal')
+						.find('.modal-dialog')
+						.removeClass('modal-lg');
 
-                        $('#global-modal')
-                            .find('.modal-body')
-                            .html(response);
+					$('#global-modal')
+						.find('.modal-body')
+						.html(response);
 
-                        $('#global-modal').modal('show');
-                    });
-                })
-                .appendTo(chatboxoptions);
-        }
+					$('#global-modal').modal('show');
+				});
+			})
+			.appendTo(chatboxoptions);
+	}
 
-        $('<a>')
-            .addClass('btn btn-xs togglelink')
-            .attr({
-                href: 'javascript:void(0)',
-                rel: user_id
-            })
-            .html('<i class="fa fa-toggle-down"></i>')
-            .appendTo(chatboxoptions);
-
-        $('<a>')
-            .addClass('btn btn-xs closelink')
-            .attr({
-                href: 'javascript:void(0)',
-                rel: user_id
-            })
-            .html('<i class="fa fa-close"></i>')
-            .appendTo(chatboxoptions);
-
-        $('<br>')
-            .attr('clear', 'all')
-            .appendTo(chatboxHead);
-
-        var chatboxContent = $('<div>')
-            .addClass('chatboxcontent');
-
-        var chatboxInput = $('<div>')
-            .addClass('chatboxinput');
-
-        $('<textarea>')
-            .addClass('chatboxtextarea')
-            .on('keydown', function(e) {
-                return checkChatBoxInputKey(e.originalEvent, this, user_id);
-            })
-            .appendTo(chatboxInput);
-
-        chatbox
-            .append(chatboxHead)
-            .append(chatboxContent)
-            .append(chatboxInput)
-            .appendTo('body');
+	$('<a>')
+		.addClass('btn btn-xs togglelink')
+		.attr({
+			href: 'javascript:void(0)',
+			rel: user_id
+		})
+		.html('<i class="fa fa-toggle-down"></i>')
+		.appendTo(chatboxoptions);
+
+	$('<a>')
+		.addClass('btn btn-xs closelink')
+		.attr({
+			href: 'javascript:void(0)',
+			rel: user_id
+		})
+		.html('<i class="fa fa-close"></i>')
+		.appendTo(chatboxoptions);
+
+	$('<br>')
+		.attr('clear', 'all')
+		.appendTo(chatboxHead);
+
+	var chatboxContent = $('<div>')
+		.addClass('chatboxcontent');
+
+	var chatboxInput = $('<div>')
+		.addClass('chatboxinput');
+
+	$('<textarea>')
+		.addClass('chatboxtextarea')
+		.on('keydown', function(e) {
+			return checkChatBoxInputKey(e.originalEvent, this, user_id);
+		})
+		.appendTo(chatboxInput);
+
+	chatbox
+		.append(chatboxHead)
+		.append(chatboxContent)
+		.append(chatboxInput)
+		.appendTo('body');
 
 	chatBoxeslength = 0;
 
diff --git a/main/inc/lib/social.lib.php b/main/inc/lib/social.lib.php
index d96465f1b7..104ceb0d8b 100755
--- a/main/inc/lib/social.lib.php
+++ b/main/inc/lib/social.lib.php
@@ -1498,7 +1498,11 @@ class SocialManager extends UserManager
             return '';
         }
 
-        $socialAvatarBlock = SocialManager::show_social_avatar_block($groupBlock, $groupId, $userId);
+        $socialAvatarBlock = SocialManager::show_social_avatar_block(
+            $groupBlock,
+            $groupId,
+            $userId
+        );
 
         $profileEditionLink = null;
         if (api_get_user_id() == $userId) {
diff --git a/main/social/profile.php b/main/social/profile.php
index ce2586de13..76f8cbbfd6 100755
--- a/main/social/profile.php
+++ b/main/social/profile.php
@@ -145,7 +145,7 @@ $locale = api_get_language_isocode();
 // Add Jquery scroll pagination plugin
 $htmlHeadXtra[] = api_get_js('jscroll/jquery.jscroll.js');
 // Add Jquery Time ago plugin
-$htmlHeadXtra[] = api_get_js('jquery-timeago/jquery.timeago.js');
+$htmlHeadXtra[] = api_get_asset('jquery-timeago/jquery.timeago.js');
 $timeAgoLocaleDir = $javascriptDir . 'jquery-timeago/locales/jquery.timeago.' . $locale . '.js';
 if (file_exists($timeAgoLocaleDir)) {
     $htmlHeadXtra[] = api_get_js('jquery-timeago/locales/jquery.timeago.' . $locale . '.js');
@@ -255,23 +255,20 @@ foreach ($sessionList as $session) {
 }
 
 // My friends
-$friend_html = SocialManager::listMyFriends($user_id, $link_shared ,$show_full_profile);
+$friend_html = SocialManager::listMyFriends(
+    $user_id,
+    $link_shared,
+    $show_full_profile
+);
 
 $wallSocialAddPost = SocialManager::getWallForm();
 $social_wall_block = $wallSocialAddPost;
 
 // Social Post Wall
-$post_wall = SocialManager::getWallMessagesByUser($my_user_id, $friendId) ;
-
-$social_post_wall_block  = '<div class="panel panel-default social-post">';
-$social_post_wall_block .= '<div class="panel-heading">Mis publicaciones</div>';
-$social_post_wall_block .='<div class="panel-body">';
-if(empty($post_wall)){
-    $social_post_wall_block .= '<p>'.get_lang("NoPosts").'</p>';
-}else{
-    $social_post_wall_block .= $post_wall;
-}
-$social_post_wall_block .= '</div></div>';
+$posts = SocialManager::getWallMessagesByUser($my_user_id, $friendId) ;
+
+$posts = empty($posts) ? '<p>'.get_lang("NoPosts").'</p>' : $posts;
+$social_post_wall_block = Display::panel($posts, get_lang('Posts'));
 
 $socialAutoExtendLink = Display::url(
     get_lang('SeeMore'),
@@ -291,10 +288,6 @@ if ($show_full_profile) {
 
     $extra_information = '';
     if (is_array($extra_user_data) && count($extra_user_data)>0 ) {
-
-        $extra_information .= '<div class="panel panel-default">';
-        $extra_information .= '<div class="panel-heading">'.get_lang('ExtraInformation').'</div>';
-        $extra_information .='<div class="panel-body">';
         $extra_information_value = '';
         $extraField = new ExtraField('user');
         foreach ($extra_user_data as $key => $data) {
@@ -375,19 +368,21 @@ if ($show_full_profile) {
                     break;
                 }
             }
-
         }
+
         // if there are information to show
         if (!empty($extra_information_value)) {
-            $extra_information .= $extra_information_value;
+            $extra_information .= Display::panel(
+                $extra_information_value,
+                get_lang('ExtraInformation')
+            );
         }
-        $extra_information .= '</div></div>'; //social-profile-info
     }
 
     // If there are information to show Block Extra Information
 
     if (!empty($extra_information_value)) {
-        $social_extra_info_block =  $extra_information;
+        $social_extra_info_block = $extra_information;
     }
 
     // MY GROUPS
@@ -398,12 +393,14 @@ if ($show_full_profile) {
     if (is_array($results) && count($results) > 0) {
         $i = 1;
         foreach ($results as $result) {
-            if ($i > $max_numbers_of_group) break;
+            if ($i > $max_numbers_of_group) {
+                break;
+            }
             $id = $result['id'];
             $url_open  = '<a href="group_view.php?id='.$id.'">';
             $url_close = '</a>';
             $icon = '';
-            $name = cut($result['name'],CUT_GROUP_NAME,true);
+            $name = cut($result['name'], CUT_GROUP_NAME, true);
             if ($result['relation_type'] == GROUP_USER_PERMISSION_ADMIN) {
                 $icon = Display::return_icon(
                     'social_group_admin.png',
@@ -425,7 +422,11 @@ if ($show_full_profile) {
             }
             $item_name = $url_open.$name.$icon.$url_close;
             $item_actions = '';
-            $grid_my_groups[]= array($item_name,$url_open.$result['picture'].$url_close, $item_actions);
+            $grid_my_groups[] = array(
+                $item_name,
+                $url_open.$result['picture'].$url_close,
+                $item_actions,
+            );
             $i++;
         }
     }
@@ -439,6 +440,7 @@ if ($show_full_profile) {
         } else {
             $count_groups = count($results);
         }
+
         $my_groups .= '<div class="panel panel-default">';
         $my_groups .= '<div class="panel-heading">'.get_lang('MyGroups').' ('.$count_groups.') </div>';
 
@@ -512,7 +514,9 @@ if ($show_full_profile) {
     }
 
     $count_pending_invitations = 0;
-    if (!isset($_GET['u']) || (isset($_GET['u']) && $_GET['u']==api_get_user_id())) {
+    if (!isset($_GET['u']) ||
+        (isset($_GET['u']) && $_GET['u']==api_get_user_id())
+    ) {
         $pending_invitations = SocialManager::get_list_invitation_of_friends_by_user_id(api_get_user_id());
         $list_get_path_web = SocialManager::get_list_web_path_user_invitation_by_user_id(api_get_user_id());
         $count_pending_invitations = count($pending_invitations);
@@ -560,7 +564,7 @@ if ($show_full_profile) {
             }
         }
 
-        //--Productions
+        // Productions
         $production_list =  UserManager::build_production_list($user_id);
 
         $product_content  = '';
diff --git a/main/template/default/layout/page_body.tpl b/main/template/default/layout/page_body.tpl
index ce5a28f3ca..2fdb4230c2 100755
--- a/main/template/default/layout/page_body.tpl
+++ b/main/template/default/layout/page_body.tpl
@@ -6,6 +6,7 @@
 {% endif %}
 
 {{ flash_messages }}
+<span id="js_alerts"></span>
 
 {#  Page header #}
 {% if header != '' %}