'.Display::return_icon('content-post-group1.jpg',get_lang('Theme')).'
';
- $html .= '';
- $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 .= '';
- }
- } else {
- $html .= '';
+ }
+ uasort($topics,array('MessageManager','order_desc_date'));
+
+ $param_names = array_keys($_GET);
+ $array_html = array();
+ foreach ($topics as $index => $topic) {
+ $html = '';
+ // topics
+ $indent = 0;
+ $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 .= '
'; //rounded_div
+
+ $array_html[] = array($html);
+ }
+ // grids for items and topics with paginations
- $html_messages .= '';
+ //$html_messages .= '';
}
return $html_messages;
@@ -1139,11 +1127,10 @@ function inbox_display() {
$table->set_header(0, '', false,array ('style' => 'width:20px;'));
$title=api_xml_http_response_encode(get_lang('Title'));
$action=api_xml_http_response_encode(get_lang('Actions'));
-
- $table->set_header(1,api_xml_http_response_encode(get_lang('From')),true);
- $table->set_header(2,$title,true);
- $table->set_header(3,api_xml_http_response_encode(get_lang('Date')),true, array('style' => 'width:150px;'));
- $table->set_header(4,$action,false,array ('style' => 'width:70px;'));
+ $table->set_header(1,api_xml_http_response_encode(get_lang('Messages')),false);
+ //$table->set_header(2,$title,true);
+ $table->set_header(2,api_xml_http_response_encode(get_lang('Date')),true, array('style' => 'width:150px;'));
+ $table->set_header(3,$action,false,array ('style' => 'width:70px;'));
if ($_REQUEST['f']=='social') {
$parameters['f'] = 'social';
@@ -1225,10 +1212,10 @@ function outbox_display() {
$title = api_xml_http_response_encode(get_lang('Title'));
$action= api_xml_http_response_encode(get_lang('Actions'));
- $table->set_header(1, api_xml_http_response_encode(get_lang('To')),true);
- $table->set_header(2, $title,true);
- $table->set_header(3, api_xml_http_response_encode(get_lang('Date')),true,array ('style' => 'width:150px;'));
- $table->set_header(4,$action, false,array ('style' => 'width:70px;'));
+ $table->set_header(1, api_xml_http_response_encode(get_lang('Messages')),false);
+ //$table->set_header(2, $title,true);
+ $table->set_header(2, api_xml_http_response_encode(get_lang('Date')),true,array ('style' => 'width:150px;'));
+ $table->set_header(3,$action, false,array ('style' => 'width:70px;'));
/*
if ($_REQUEST['f']=='social') {
diff --git a/main/messages/new_message.php b/main/messages/new_message.php
index 52c84e499c..97052e5d0b 100755
--- a/main/messages/new_message.php
+++ b/main/messages/new_message.php
@@ -95,8 +95,16 @@ function add_image_form() {
}
}
}
+
-';
+';
$nameTools = get_lang('ComposeMessage');
diff --git a/main/messages/outbox.php b/main/messages/outbox.php
index 67c3f57ea1..7c9ad65615 100755
--- a/main/messages/outbox.php
+++ b/main/messages/outbox.php
@@ -153,8 +153,6 @@ echo '';
+
+ $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 .= '';
}
+ } else {
+ $html .= '';
+ }
+
+ $html .= '
';
+
+ $html .= '';
+ $html .= '';
+ $html.= '
';
- $array_html[] = array($html);
+ // grids for items with paginations
+ $html .= Display::return_sortable_grid('items_'.$topic['id'], array(), $array_html_items, array('hide_navigation'=>false, 'per_page' => $items_per_page), $query_vars, false, array(true, true, true,false), false);
}
- // grids for items and topics with paginations
+ $html .= '';
+ $html.= '
';
- $html .= '
+ '.Display :: return_icon('talk.png', get_lang('Reply')).'';
- $html .= '
';
- $html .= '';
- $html .= '';
- $html.= '
';
+
+ $array_html_items[] = array($html_items);
}
- $html .= '';
- $html.= '
'; - $image_path = UserManager::get_user_picture_path_by_id($topic['user_sender_id'], 'web', false, true); $image_repository = $image_path['dir']; - $existing_image = $image_path['file']; - $html.= ''; - $html.= ''; - $html.= ''; - $html.= '
';
-
- // items
- if (is_array($topic['items'])) {
-
- $items_page_nr = intval($_GET['items_'.$topic['id'].'_page_nr']);
- $array_html_items = array();
- foreach ($topic['items'] as $item) {
- $html_items = '';
- //$indent = $item['indent_cnt']*'15';
- $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_items.= '
- '.Display :: return_icon('talk.png', get_lang('Reply')).'';
-
- if (($my_group_role == GROUP_USER_PERMISSION_ADMIN || $my_group_role == GROUP_USER_PERMISSION_MODERATOR) || $topic['user_sender_id'] == $current_user_id) {
- $html.= ' '.Display :: return_icon('edit.gif', get_lang('Edit')).'';
- }
-
- $html.= '
';
- $html.= ''; - $image_path = UserManager::get_user_picture_path_by_id($topic['user_sender_id'], 'web', false, true); $image_repository = $image_path['dir']; - $existing_image = $image_path['file']; - $html.= ''; - $html.= ''; - $html.= ''; - $html.= '
';
- $html_items .= '
'; + $image_path = UserManager::get_user_picture_path_by_id($topic['user_sender_id'], 'web', false, true); $image_repository = $image_path['dir']; $existing_image = $image_path['file']; - $html_items.= ''; - $html_items.= ''; - - if ($item['send_date'] != $item['update_date']) { - if (!empty($item['update_date']) && $item['update_date'] != '0000-00-00 00:00:00' ) { - $html_items .= ''; - } - } else { - $html_items .= ''; + $html.= ''; + $html.= ''; + $html.= ''; + $html.= '
';
+
+ // items
+ if (is_array($topic['items'])) {
+
+ $items_page_nr = intval($_GET['items_'.$topic['id'].'_page_nr']);
+ $array_html_items = array();
+ foreach ($topic['items'] as $item) {
+ $html_items = '';
+ //$indent = $item['indent_cnt']*'15';
+ $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_items.= ''.Display::return_icon('content-post-reply01.jpg',get_lang('Message')).'
';
- $html_items .= '';
+ $html.= ''; + $image_path = UserManager::get_user_picture_path_by_id($topic['user_sender_id'], 'web', false, true); $image_repository = $image_path['dir']; $existing_image = $image_path['file']; - $html_items.= ''; - $html_items.= ''; - - if ($item['send_date'] != $item['update_date']) { - if (!empty($item['update_date']) && $item['update_date'] != '0000-00-00 00:00:00' ) { - $html_items .= ''; - } - } else { - $html_items .= ''; + $html.= ''; + $html.= ''; + $html.= ''; + $html.= '
';
+ $html_items .= '
';
- $array_html_items[] = array($html_items);
- }
- // grids for items with paginations
- $html .= Display::return_sortable_grid('items_'.$topic['id'], array(), $array_html_items, array('hide_navigation'=>false, 'per_page' => $items_per_page), $query_vars, false, array(true, true, true,false), false);
+ $html_items.= ''.Display::return_icon('content-post-reply01.jpg',get_lang('Message')).'
';
+ $html_items .= '';
+ $html_items.= '
';
+ $html_items.= '';
$html_items.= '';
+
+ $html_items.= ''.Display :: return_icon('talk.png', get_lang('Reply')).'';
+
+ if (($my_group_role == GROUP_USER_PERMISSION_ADMIN || $my_group_role == GROUP_USER_PERMISSION_MODERATOR) || $item['user_sender_id'] == $current_user_id) {
+ $html_items.= ' '.Display :: return_icon('edit.gif', get_lang('Edit')).'';
+ }
+ $html_items.= '
';
+ //$html_items.= '';
+ $image_path = UserManager::get_user_picture_path_by_id($topic['user_sender_id'], 'web', false, true); $image_repository = $image_path['dir'];
+ $existing_image = $image_path['file'];
+ $html_items.= '';
+ $html_items.= '';
+
+ if ($item['send_date'] != $item['update_date']) {
+ if (!empty($item['update_date']) && $item['update_date'] != '0000-00-00 00:00:00' ) {
+ $html_items .= '';
}
+ } else {
+ $html_items .= '';
+ }
- $html_items.= '';
- $html_items.= '