'.$icon_rss.' '.$rss->channel['title'].'
'; @@ -1118,7 +1148,7 @@ class SocialManager extends UserManager */ public static function sendWallMessage($userId, $friendId, $messageContent, $messageId = 0 ,$messageStatus) { - $tblMessage = Database::get_main_table(TABLE_MAIN_MESSAGE); + $tblMessage = Database::get_main_table(TABLE_MESSAGE); $userId = intval($userId); $friendId = intval($friendId); $messageId = intval($messageId); @@ -1217,24 +1247,23 @@ class SocialManager extends UserManager if (empty($start)) { $start = '0000-00-00'; } - $tblMessage = Database::get_main_table(TABLE_MAIN_MESSAGE); + $tblMessage = Database::get_main_table(TABLE_MESSAGE); + $tblMessageAttachement = Database::get_main_table(TABLE_MESSAGE_ATTACHMENT); + $userId = intval($userId); $start = Database::escape_string($start); - // TODO: set a maximum of 3 months for messages - //if ($start == '0000-00-00') { - // - //} $limit = intval($limit); - $messages = array(); + $sql = "SELECT id, user_sender_id,user_receiver_id, send_date, content, parent_id, - (SELECT ma.path from message_attachment ma WHERE ma.message_id = tm.id ) as path, - (SELECT ma.filename from message_attachment ma WHERE ma.message_id = tm.id ) as filename - FROM $tblMessage tm - WHERE user_receiver_id = $userId + (SELECT ma.path FROM $tblMessageAttachement ma WHERE ma.message_id = tm.id ) as path, + (SELECT ma.filename FROM $tblMessageAttachement ma WHERE ma.message_id = tm.id ) as filename + FROM $tblMessage tm + WHERE user_receiver_id = $userId AND send_date > '$start' "; $sql .= (empty($messageStatus) || is_null($messageStatus)) ? '' : " AND msg_status = '$messageStatus' "; $sql .= (empty($parentId) || is_null($parentId)) ? '' : " AND parent_id = '$parentId' "; $sql .= " ORDER BY send_date DESC LIMIT $offset, $limit "; + $messages = array(); $res = Database::query($sql); if (Database::num_rows($res) > 0) { while ($row = Database::fetch_array($res)) { @@ -1284,7 +1313,7 @@ class SocialManager extends UserManager if ($isOwnWall) { $media .= '';
$media .= ''.get_lang('x').'';
+ $message['id'].'">x';
$media .= '
';
}
$media .= '';
@@ -1404,11 +1433,10 @@ class SocialManager extends UserManager
$wallImage = '
';
}
-
$htmlDelete = '';
if ($isOwnWall) {
$htmlDelete .= ''.get_lang('x').'';
+ $message['id'].'">x';
}
$html = '';
@@ -1523,6 +1551,7 @@ class SocialManager extends UserManager
/**
* Generate the social block for a user
+ * @param Template $template
* @param int $userId The user id
* @param string $groupBlock Optional. Highlight link possible values:
* group_add, home, messages, messages_inbox, messages_compose,
@@ -1530,7 +1559,7 @@ class SocialManager extends UserManager
* @param int $groupId Optional. Group ID
* @return string The HTML code with the social block
*/
- public static function setSocialUserBlock($template, $userId, $groupBlock = '', $groupId = 0)
+ public static function setSocialUserBlock(Template $template, $userId, $groupBlock = '', $groupId = 0)
{
if (api_get_setting('allow_social_tool') != 'true') {
return '';
@@ -1548,4 +1577,106 @@ class SocialManager extends UserManager
$template->assign('profileEditionLink', $profileEditionLink);
$template->assign('social_avatar_block', $template->fetch('default/social/user_block.tpl'));
}
+
+ /**
+ * @param $user_id
+ * @param $link_shared
+ * @param $show_full_profile
+ * @return string
+ */
+ public static function listMyFriends($user_id, $link_shared, $show_full_profile)
+ {
+ //SOCIALGOODFRIEND , USER_RELATION_TYPE_FRIEND, USER_RELATION_TYPE_PARENT
+ $friends = SocialManager::get_friends($user_id, USER_RELATION_TYPE_FRIEND);
+ $number_of_images = 30;
+ $number_friends = count($friends);
+
+ $friendHtml = '';
+
+ if ($number_friends != 0) {
+ if ($number_friends > $number_of_images) {
+ if (api_get_user_id() == $user_id) {
+ $friendHtml.= ' : '.get_lang('SeeAll').'';
+ } else {
+ $friendHtml.= ' : '
+ .''.get_lang('SeeAll').'';
+ }
+ }
+
+ $friendHtml.= '
- ';
+ $j = 1;
+ for ($k=0; $k < $number_friends; $k++) {
+ if ($j > $number_of_images) break;
+
+ if (isset($friends[$k])) {
+ $friend = $friends[$k];
+ $name_user = api_get_person_name($friend['firstName'], $friend['lastName']);
+ $user_info_friend = api_get_user_info($friend['friend_user_id'], true);
+
+ if ($user_info_friend['user_is_online']) {
+ $statusIcon = Display::span('', array('class' => 'online_user_in_text'));
+ } else {
+ $statusIcon = Display::span('', array('class' => 'offline_user_in_text'));
+ }
+
+ $friendHtml.= '
- ';
+ // the height = 92 must be the same in the image_friend_network span style in default.css
+ $friends_profile = SocialManager::get_picture_user($friend['friend_user_id'], $friend['image'], 20, USER_IMAGE_SIZE_SMALL);
+ $friendHtml.= '
'; + $link_shared = (empty($link_shared)) ? '' : '&'.$link_shared; + $friendHtml.= $statusIcon .'' . $name_user .''; + $friendHtml.= '
';
+ }
+ $j++;
+ }
+ $friendHtml.='
'.get_lang('NoFriendsInYourContactList').'
' + .''. get_lang('TryAndFindSomeFriends').'
';
+ }
+
+ return $friendHtml;
+ }
+
+ /**
+ * @return string
+ */
+ public static function getWallForm()
+ {
+ $form = new FormValidator(
+ 'social_wall_main',
+ 'post',
+ api_get_path(WEB_CODE_PATH).'social/profile.php',
+ null,
+ array('enctype' => 'multipart/form-data')
+ );
+
+ $form->addTextarea('social_wall_new_msg_main', null, array('placeholder' => get_lang('SocialWallWhatAreYouThinkingAbout')));
+ $form->addButtonSend(get_lang('Post'));
+ $html = Display::panel($form->returnForm(), get_lang('SocialWall'));
+
+ return $html;
+ }
+
+ /**
+ * @param int $userId
+ * @param int $friendId
+ * @return string
+ */
+ public static function getWallMessagesByUser($userId, $friendId)
+ {
+ $messages = SocialManager::getWallMessagesPostHTML($userId, $friendId);
+ $html = '';
+
+ foreach ($messages as $message) {
+ $post = $message['html'];
+ $comment = SocialManager::getWallMessagesHTML($userId, $friendId, $message['id']);
+
+ $html .= $post.$comment;
+ }
+
+ return $html;
+ }
}
diff --git a/main/inc/lib/statistics.lib.php b/main/inc/lib/statistics.lib.php
index 5ee2c63d40..50eb4758a7 100644
--- a/main/inc/lib/statistics.lib.php
+++ b/main/inc/lib/statistics.lib.php
@@ -703,7 +703,7 @@ class Statistics
*/
public static function getMessages($messageType)
{
- $message_table = Database::get_main_table(TABLE_MAIN_MESSAGE);
+ $message_table = Database::get_main_table(TABLE_MESSAGE);
$user_table = Database::get_main_table(TABLE_MAIN_USER);
$access_url_rel_user_table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
diff --git a/main/inc/lib/usermanager.lib.php b/main/inc/lib/usermanager.lib.php
index 26183fe95c..72691c2dfe 100755
--- a/main/inc/lib/usermanager.lib.php
+++ b/main/inc/lib/usermanager.lib.php
@@ -4062,7 +4062,7 @@ class UserManager
public static function remove_user_rel_user($friend_id, $real_removed = false, $with_status_condition = '')
{
$tbl_my_friend = Database :: get_main_table(TABLE_MAIN_USER_REL_USER);
- $tbl_my_message = Database :: get_main_table(TABLE_MAIN_MESSAGE);
+ $tbl_my_message = Database :: get_main_table(TABLE_MESSAGE);
$friend_id = intval($friend_id);
if ($real_removed) {
diff --git a/main/messages/new_message.php b/main/messages/new_message.php
index cf8d0b4a6b..d231ea0eb5 100755
--- a/main/messages/new_message.php
+++ b/main/messages/new_message.php
@@ -118,7 +118,7 @@ $nameTools = get_lang('ComposeMessage');
/**
* Shows the compose area + a list of users to select from.
*/
-function show_compose_to_any ($user_id) {
+function show_compose_to_any($user_id) {
$online_user_list = MessageManager::get_online_user_list($user_id);
$default['user_list'] = 0;
$online_user_list=null;
@@ -129,26 +129,23 @@ function show_compose_to_any ($user_id) {
function show_compose_reply_to_message($message_id, $receiver_id)
{
$table_message = Database::get_main_table(TABLE_MESSAGE);
- $query = "SELECT user_sender_id FROM $table_message WHERE user_receiver_id=".intval($receiver_id)." AND id='".intval($message_id)."';";
+ $query = "SELECT user_sender_id FROM $table_message
+ WHERE user_receiver_id=".intval($receiver_id)." AND id='".intval($message_id)."';";
$result = Database::query($query);
$row = Database::fetch_array($result,'ASSOC');
if (!isset($row['user_sender_id'])) {
$html = get_lang('InvalidMessageId');
+
return $html;
}
- $pre_html = '' + .''. get_lang('TryAndFindSomeFriends').'
-
-
';
- $sent_to = $pre_html.''.GetFullUserName($row['user_sender_id']).''.$post;
+ $userInfo = api_get_user_info($row['user_sender_id']);
$default['users'] = array($row['user_sender_id']);
- $html .= manage_form($default, null, $sent_to);
+ $html = manage_form($default, null, $userInfo['complete_name']);
return $html;
}
function show_compose_to_user ($receiver_id) {
- global $charset;
$html = get_lang('To').': '.GetFullUserName($receiver_id).'';
$default['title'] = api_xml_http_response_encode(get_lang('EnterTitle'));
$default['users'] = array($receiver_id);
@@ -156,7 +153,8 @@ function show_compose_to_user ($receiver_id) {
return $html;
}
-function manage_form($default, $select_from_user_list = null, $sent_to = null) {
+function manage_form($default, $select_from_user_list = null, $sent_to = null)
+{
$group_id = isset($_REQUEST['group_id']) ? intval($_REQUEST['group_id']) : null;
$message_id = isset($_GET['message_id']) ? intval($_GET['message_id']) : null;
$param_f = isset($_GET['f']) && $_GET['f'] == 'social' ? 'social' : null;
@@ -169,7 +167,6 @@ function manage_form($default, $select_from_user_list = null, $sent_to = null) {
get_lang('SendMessageTo'),
true,
array(
- 'class' => 'span4',
'id'=>'id_text_name',
'onkeyup'=>'send_request_and_search()',
'autocomplete'=>'off'
@@ -180,7 +177,7 @@ function manage_form($default, $select_from_user_list = null, $sent_to = null) {
$form->addElement('hidden','user_list', 0, array('id'=>'user_list'));
} else {
if (!empty($sent_to)) {
- $form->addElement('html',$sent_to);
+ $form->addLabel(get_lang('SendMessageTo'), $sent_to);
}
if (empty($default['users'])) {
//fb select
@@ -197,7 +194,7 @@ function manage_form($default, $select_from_user_list = null, $sent_to = null) {
$form->addElement('hidden','parent_id',$message_id);
}
- $form->addText('title', get_lang('Subject'), true, array('class' => 'col-md-4'));
+ $form->addText('title', get_lang('Subject'), true);
$form->addHtmlEditor('content', get_lang('Message'), false, false, array('ToolbarSet' => 'Messages', 'Width' => '100%', 'Height' => '250'));
if (isset($_GET['re_id'])) {
@@ -223,7 +220,7 @@ function manage_form($default, $select_from_user_list = null, $sent_to = null) {
$form->addElement('advanced_settings',''.get_lang('AddOneMoreFile').' ('.sprintf(get_lang('MaximunFileSizeX'),format_file_size(api_get_setting('message_max_upload_filesize'))).')');
}
- $form->addElement('style_submit_button','compose',api_xml_http_response_encode(' '.get_lang('SendMessage')),'class="btn-success"');
+ $form->addButtonSend(get_lang('SendMessage'), 'compose');
$form->setRequiredNote('* '.get_lang('ThisFieldIsRequired').'');
if (!empty($group_id) && !empty($message_id)) {
@@ -270,13 +267,15 @@ function manage_form($default, $select_from_user_list = null, $sent_to = null) {
$token = Security::get_token();
$form->addElement('hidden','sec_token');
$form->setConstants(array('sec_token' => $token));
- $html .= $form->return_form();
+ $html .= $form->returnForm();
}
return $html;
}
+$socialToolIsActive = isset($_GET['f']) && $_GET['f'] == 'social';
+
/* MAIN SECTION */
-if ($_GET['f']=='social') {
+if ($socialToolIsActive) {
$this_section = SECTION_SOCIAL;
$interbreadcrumb[]= array ('url' => api_get_path(WEB_PATH).'main/social/home.php','name' => get_lang('SocialNetwork'));
} else {
@@ -288,11 +287,13 @@ $group_id = isset($_REQUEST['group_id']) ? intval($_REQUEST['group_id']) : null;
$social_right_content = null;
if ($group_id != 0) {
$social_right_content .= '';
- $post = '
';
- $social_right_content .= ''.Display::return_icon('back.png',api_xml_http_response_encode(get_lang('ComposeMessage'))).'';
- $social_right_content .= ''.Display::return_icon('message_new.png',api_xml_http_response_encode(get_lang('ComposeMessage'))).'';
+ $social_right_content .= ''.
+ Display::return_icon('back.png',api_xml_http_response_encode(get_lang('ComposeMessage'))).'';
+ $social_right_content .= ''.
+ Display::return_icon('message_new.png',api_xml_http_response_encode(get_lang('ComposeMessage'))).'';
$social_right_content .= '
';
} else {
- if ($_GET['f']=='social') {
+ if ($socialToolIsActive) {
} else {
$social_right_content .= '';
if (api_get_setting('allow_social_tool') == 'true' && api_get_setting('allow_message_tool') == 'true') {
@@ -329,7 +330,7 @@ if (!isset($_POST['compose'])) {
} elseif(isset($_GET['send_to_user'])) {
$social_right_content .= show_compose_to_user($_GET['send_to_user']);
} else {
- $social_right_content .= show_compose_to_any($_user['user_id']);
+ $social_right_content .= show_compose_to_any(api_get_user_id());
}
} else {
$restrict = false;
diff --git a/main/messages/view_message.php b/main/messages/view_message.php
index dfe34606c0..31525cb19d 100755
--- a/main/messages/view_message.php
+++ b/main/messages/view_message.php
@@ -75,7 +75,6 @@ $tpl = new Template(get_lang('View'));
SocialManager::setSocialUserBlock($tpl, $user_id, $show_menu);
if (api_get_setting('allow_social_tool') == 'true') {
- $tpl->assign('social_avatar_block', $social_avatar_block);
$tpl->assign('social_menu_block', $social_menu_block);
$tpl->assign('social_right_content', $social_right_content);
$social_layout = $tpl->get_template('social/inbox.tpl');
diff --git a/main/social/profile.php b/main/social/profile.php
index 32738acbf5..d5d020fa30 100755
--- a/main/social/profile.php
+++ b/main/social/profile.php
@@ -236,7 +236,7 @@ foreach ($sessionList as $session) {
}
// My friends
-$friend_html = listMyFriends($user_id, $link_shared ,$show_full_profile);
+$friend_html = SocialManager::listMyFriends($user_id, $link_shared ,$show_full_profile);
$social_left_content = '';
/*
@@ -281,11 +281,11 @@ if ($show_full_profile) {
*/
//Social Block Wall
-$wallSocialAddPost = wallSocialAddPost();
+$wallSocialAddPost = SocialManager::getWallForm();
$social_wall_block = $wallSocialAddPost;
//Social Post Wall
-$post_wall = wallSocialPost($my_user_id,$friendId) ;
+$post_wall = SocialManager::getWallMessagesByUser($my_user_id, $friendId) ;
$social_post_wall_block = '
';
$social_post_wall_block .= '
Mis publicaciones
';
$social_post_wall_block .='';
@@ -749,99 +749,3 @@ $tpl->assign('formModals', $formModals);
$social_layout = $tpl->get_template('social/profile.tpl');
$tpl->display($social_layout);
-/*
-* function list my friends
-*/
-function listMyFriends($user_id, $link_shared, $show_full_profile)
-{
- //SOCIALGOODFRIEND , USER_RELATION_TYPE_FRIEND, USER_RELATION_TYPE_PARENT
- $friends = SocialManager::get_friends($user_id, USER_RELATION_TYPE_FRIEND);
-
- $friendHtml = '';
- $number_of_images = 30;
- $number_friends = 0;
- $number_friends = count($friends);
-
- $friendHtml = '';
-
- if ($number_friends != 0) {
- if ($number_friends > $number_of_images) {
- if (api_get_user_id() == $user_id) {
- $friendHtml.= ' : '.get_lang('SeeAll').'';
- } else {
- $friendHtml.= ' : '
- .''.get_lang('SeeAll').'';
- }
- }
-
- $friendHtml.= '
- ';
- $j = 1;
- for ($k=0; $k < $number_friends; $k++) {
- if ($j > $number_of_images) break;
-
- if (isset($friends[$k])) {
- $friend = $friends[$k];
- $name_user = api_get_person_name($friend['firstName'], $friend['lastName']);
- $user_info_friend = api_get_user_info($friend['friend_user_id'], true);
-
- if ($user_info_friend['user_is_online']) {
- $statusIcon = Display::span('', array('class' => 'online_user_in_text'));
- } else {
- $statusIcon = Display::span('', array('class' => 'offline_user_in_text'));
- }
-
- $friendHtml.= '
- ';
- // the height = 92 must be the sqme in the image_friend_network span style in default.css
- $friends_profile = SocialManager::get_picture_user($friend['friend_user_id'], $friend['image'], 20, USER_IMAGE_SIZE_SMALL);
- $friendHtml.= '';
- }
- $j++;
- }
- $friendHtml.='
'.get_lang('NoFriendsInYourContactList').'
' - .''. get_lang('TryAndFindSomeFriends').'
';
- }
-
- return $friendHtml;
-}
-
-
-function wallSocialAddPost()
-{
- $html = '';
-
- return $html;
-}
-
-function wallSocialPost($userId, $friendId)
-{
- $array = SocialManager::getWallMessagesPostHTML($userId, $friendId);
- $html = '';
-
- for($i = 0; $i < count($array); $i++) {
- $post = $array[$i]['html'];
- $comment = SocialManager::getWallMessagesHTML($userId, $friendId, $array[$i]['id']);
-
- $html .= $post.$comment;
- }
-
- return $html;
-}
' - .''. get_lang('TryAndFindSomeFriends').'