';
+ $html .= '
+
+
';
foreach ($topics as $index => $topic) {
if (!in_array($index,$parents)) continue;
@@ -876,40 +876,38 @@ class MessageManager
$user_sender_info = UserManager::get_user_info_by_id($topic['user_sender_id']);
$files_attachments = self::get_links_message_attachment_files($topic['id']);
$name = api_get_person_name($user_sender_info['firstname'], $user_sender_info['lastname']);
- $html .= '| '.$pager['details'].' | '.$pager['links'].' |
';
- $html .= '
- '.((isset($_GET['div_id']) && $_GET['div_id'] == 'content_'.$topic['id'])?Display::return_icon('div_hide.gif',get_lang('Hide'),array('style'=>'vertical-align: middle')):
- Display::return_icon('div_show.gif',get_lang('Show'),array('style'=>'vertical-align: middle'))).'
- ';
- //$html .= '';
- $html .= '';
- if ($topic['send_date']!=$topic['update_date']) {
- if (!empty($topic['update_date']) && $topic['update_date'] != '0000-00-00 00:00:00' ) {
- $html .= '';
- }
- } else {
- $html .= '';
- }
-
-
- $html .= '
';
+ $html .= '
';
+ $html .= '
'.Display::return_icon('content-post-group1.jpg').'
';
+ $html .= '';
+ $html .= '
+ ';
+ $html .= '';
+
+ if ($topic['send_date']!=$topic['update_date']) {
+ if (!empty($topic['update_date']) && $topic['update_date'] != '0000-00-00 00:00:00' ) {
+ $html .= ' ('.get_lang('LastUpdate').' '.date_to_str_ago($topic['update_date']).')';
+ }
+ } else {
+ $html .= ' ('.get_lang('Created').' '.date_to_str_ago($topic['send_date']).')';
+ }
+
+ $html .= '
';
+ /*
// pager
$html .= ' ';
$html .= '';
- $html.= '
';
}
$html .= '';
+ $html.= '
';
// items
if (is_array($topic['items'])) {
@@ -932,7 +930,12 @@ class MessageManager
$user_sender_info = UserManager::get_user_info_by_id($item['user_sender_id']);
$files_attachments = self::get_links_message_attachment_files($item['id']);
$name = api_get_person_name($user_sender_info['firstname'], $user_sender_info['lastname']);
- $html.= '';
$html .= '';
$html.= '
'; $html.= ''; - $html.= ''; - //$html.= ''; + $html.= ''; $html.= ''; - $html.= '
';
+ $html.= '
- '.Display :: return_icon('forumthread_new.gif', get_lang('Reply')).'';
-
+ '.Display :: return_icon('forumthread_new.gif', get_lang('Reply')).'';
if ($topic['user_sender_id'] == $current_user_id) {
$html.= ' '.Display :: return_icon('edit.gif', get_lang('Edit')).'';
- }
-
+ }
$html.= '
';
- //$html.= '';
+ $html.= ''; $html.= ''; - $html.= ''; - //$html.= ''; + $html.= ''; $html.= ''; - $html.= '
-
+
';
+ */
}
return $html;
}
diff --git a/main/inc/lib/social.lib.php b/main/inc/lib/social.lib.php
index 7fc8aa899c..9c29823ff3 100755
--- a/main/inc/lib/social.lib.php
+++ b/main/inc/lib/social.lib.php
@@ -674,7 +674,7 @@ class SocialManager extends UserManager {
if ($show == 'messages') {
echo '';
}
@@ -695,23 +695,9 @@ class SocialManager extends UserManager {
';
if ($show == 'group_messages' && !empty($group_id)) {
-
echo GroupPortalManager::show_group_column_information($group_id, api_get_user_id());
-
- }
- /*
- echo '
-
| '.$pager['links'].' |
-
-
New Topic
- 
Message list
- 
Edit Group
- 
Members list
- 
Invite Friends
-
';
+ echo '
';
+ /*
+ echo '';
+ echo '';
+ */
+ echo '
';
+ /*
echo '| '.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).' | +
';
echo get_lang('Messages');
echo '
';
+ */
$social_parameter = '?f=social';
} else {
if (api_get_setting('extended_profile') == 'true') {
@@ -53,8 +66,10 @@ if ($_GET['f']=='social') {
}
echo '';
+ $id_content_right = '';
//LEFT COLUMN
if (api_get_setting('allow_social_tool') != 'true') {
+ $id_content_right = 'inbox';
echo '
';
echo '
- ';
echo '
- '.Display::return_icon('inbox.png',get_lang('Inbox')).get_lang('Inbox').''.' '; @@ -64,10 +79,14 @@ echo '
';
echo '
';
} else {
require_once api_get_path(LIBRARY_PATH).'social.lib.php';
- SocialManager::show_social_menu('messages');
+ $id_content_right = 'socialContentRigth';
+ echo '';
}
- echo '';
+ echo '
';
//MAIN CONTENT
if (empty($_GET['id'])) {
diff --git a/main/social/group_invitation.php b/main/social/group_invitation.php
index ce4d6baab2..f093c0ec70 100755
--- a/main/social/group_invitation.php
+++ b/main/social/group_invitation.php
@@ -488,9 +488,15 @@ unset($sessionUsersList);
0) {
- echo get_lang('UsersAlreadyInvited');
+
+ foreach ($members as &$member) {
+ $image_path = UserManager::get_user_picture_path_by_id($member['user_id'], 'web', false, true);
+ $picture = UserManager::get_picture_user($member['user_id'], $image_path['file'],80);
+ $member['image'] = '
';
+ }
+ echo ''.get_lang('UsersAlreadyInvited').'';
Display::display_sortable_grid('invitation_profile', array(), $members, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, false, true,true));
}
diff --git a/main/social/group_members.php b/main/social/group_members.php
index 1d4124ba6d..d6a50900b8 100755
--- a/main/social/group_members.php
+++ b/main/social/group_members.php
@@ -102,7 +102,7 @@ if (! empty($show_message)){
Display :: display_normal_message($show_message);
}
-$users = GroupPortalManager::get_users_by_group($group_id, true, array(GROUP_USER_PERMISSION_ADMIN, GROUP_USER_PERMISSION_READER, GROUP_USER_PERMISSION_MODERATOR), 0 , 1000);
+$users = GroupPortalManager::get_users_by_group($group_id, false, array(GROUP_USER_PERMISSION_ADMIN, GROUP_USER_PERMISSION_READER, GROUP_USER_PERMISSION_MODERATOR), 0 , 1000);
$new_member_list = array();
echo '
';
@@ -133,6 +133,11 @@ echo '
';
}
break;
}
+
+ $image_path = UserManager::get_user_picture_path_by_id($user['user_id'], 'web', false, true);
+ $picture = UserManager::get_picture_user($user['user_id'], $image_path['file'],80);
+ $user['image'] = '';
+
$new_member_list[] = $user;
}
if (count($new_member_list) > 0) {
diff --git a/main/social/groups.php b/main/social/groups.php
index 7cc937b38f..d2c28d621d 100755
--- a/main/social/groups.php
+++ b/main/social/groups.php
@@ -149,22 +149,19 @@ echo '
';
echo '';
-
echo '';
echo '
';
-
-
-if ($group_id != 0 ) {
+if ($group_id != 0 ) {
+ $group_info = GroupPortalManager::get_group_data($group_id);
//Loading group information
if (isset($_GET['status']) && $_GET['status']=='sent') {
Display::display_confirmation_message(get_lang('MessageHasBeenSent'), false);
@@ -182,8 +179,7 @@ if ($group_id != 0 ) {
if (isset($_GET['action']) && $_GET['action']=='join') {
// we add a user only if is a open group
$user_join = intval($_GET['u']);
- if (api_get_user_id() == $user_join && !empty($group_id)) {
- $group_info = GroupPortalManager::get_group_data($group_id);
+ if (api_get_user_id() == $user_join && !empty($group_id)) {
if ($group_info['visibility'] == GROUP_PERMISSION_OPEN) {
GroupPortalManager::add_user_to_group($user_join, $group_id);
} else {
@@ -195,22 +191,55 @@ if ($group_id != 0 ) {
//-- Shows left column
//echo GroupPortalManager::show_group_column_information($group_id, api_get_user_id());
//---
-
- //-- Show message groups
- echo '
';
- echo '
'; // end layout messages
} else {
@@ -329,8 +358,7 @@ if ($group_id != 0 ) {
echo '';
- if (GroupPortalManager::is_group_member($group_id)) {
- $content = MessageManager::display_messages_for_group($group_id);
- if (!empty($content)) {
- echo $content;
+
+ // details about the current group
+ echo '
'; // end layout right
+ } else {
+ echo get_lang('YouShouldJoinTheGroup');
+ }
+ echo '';
+ echo '
';
+ echo '';
+
+ //-- Show message groups
+ echo ''; // end layout messages
- echo '';
+ $picture = GroupPortalManager::get_picture_group($group_id, $group_info['picture_uri'],160,'medium_');
+ $big_image = GroupPortalManager::get_picture_group($group_id, $group_info['picture_uri'],'','big_');
+ if (basename($picture['file']) != 'unknown_group.png') {
+ echo '
'; } else { - echo get_lang('YouShouldCreateATopic'); + echo '
'; + } + echo '
';
+ echo ''; } else { - echo get_lang('YouShouldCreateATopic'); + echo '
'; + } + echo '
';
+ //Group's title
+ echo '
';
+ echo ''.$group_info['name'].'
'; + //Group's description + echo ''.$group_info['description'].'
';
+ echo '';
+ //Privacy
+ echo '';
+ echo get_lang('Privacy').' : ';
+ if ($group_info['visibility']== GROUP_PERMISSION_OPEN) {
+ echo get_lang('ThisIsAnOpenGroup');
+ } elseif ($group_info['visibility']== GROUP_PERMISSION_CLOSED) {
+ echo get_lang('ThisIsACloseGroup');
}
+ echo '
';
+ //Group's tags
+ if (!empty($tags)) {
+ echo '';
+ }
+ echo ''.strtoupper(get_lang('MyGroups')).'
';
if (count($grid_my_groups) > 0) {
Display::display_sortable_grid('mygroups', array(), $grid_my_groups, array('hide_navigation'=>true, 'per_page' => 2), $query_vars, false, array(true, true, true,false));
- }
-
+ }
if (count($grid_newest_groups) > 0) {
echo ''.strtoupper(get_lang('Newest')).'
';
Display::display_sortable_grid('newest', array(), $grid_newest_groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,false));