diff --git a/main/inc/lib/message.lib.php b/main/inc/lib/message.lib.php index bd29fe961b..28f4e73a5e 100755 --- a/main/inc/lib/message.lib.php +++ b/main/inc/lib/message.lib.php @@ -994,8 +994,10 @@ class MessageManager $rows = self::calculate_children($rows, $message_id); $current_user_id = api_get_user_id(); + $topics_per_page = 5; - $items_per_page = 100; + $items_per_page = 50; + $count_items = 0; $html_messages = ''; $query_vars = array('id'=>$group_id, 'topic_id'=>$message_id , 'topics_page_nr'=>0); @@ -1007,16 +1009,21 @@ class MessageManager $links = ''; $main_content = ''; + //$items_page_nr = intval($_GET['items_'.$topic['id'].'_page_nr']); + $items_page_nr = null; + echo Display::tag('h1', $main_message['title']); $user_sender_info = UserManager::get_user_info_by_id($main_message['user_sender_id']); $files_attachments = self::get_links_message_attachment_files($main_message['id']); $name = api_get_person_name($user_sender_info['firstname'], $user_sender_info['lastname']); + $topic_page_nr = isset($_GET['topics_page_nr']) ? intval($_GET['topics_page_nr']) : null; $links.= ''; $image_path = UserManager::get_user_picture_path_by_id($main_message['user_sender_id'], 'web', false, true); @@ -1049,7 +1056,7 @@ class MessageManager if (empty($topic['id'])) { continue; } - $items_page_nr = intval($_GET['items_'.$topic['id'].'_page_nr']); + $items_page_nr = isset($_GET['items_'.$topic['id'].'_page_nr']) ? intval($_GET['items_'.$topic['id'].'_page_nr']) : null; $user_link = ''; $links = ''; @@ -1060,9 +1067,9 @@ class MessageManager $links.= ''; $image_path = UserManager::get_user_picture_path_by_id($topic['user_sender_id'], 'web', false, true); diff --git a/main/inc/lib/sortabletable.class.php b/main/inc/lib/sortabletable.class.php index e7e29d8998..f8e12b31d7 100755 --- a/main/inc/lib/sortabletable.class.php +++ b/main/inc/lib/sortabletable.class.php @@ -500,8 +500,8 @@ class SortableTable extends HTML_Table { $grid_css_class = $grid_class['main']['class']; $item_css_class = $grid_class['item']['class']; - $grid_css_style = $grid_class['main']['style']; - $item_css_style = $grid_class['item']['style']; + $grid_css_style = isset($grid_class['main']['style']) ? $grid_class['main']['style'] : null; + $item_css_style = isset($grid_class['item']['style']) ? $grid_class['item']['style'] : null; } $div = ''; diff --git a/main/social/group_topics.php b/main/social/group_topics.php index e9279d510f..ec6f7e4ef7 100644 --- a/main/social/group_topics.php +++ b/main/social/group_topics.php @@ -4,9 +4,7 @@ * @package chamilo.social * @author Julio Montoya */ -/** - * Initialization - */ + $language_file = array('userInfo', 'forum'); $cidReset = true; require_once '../inc/global.inc.php'; @@ -102,7 +100,7 @@ Display::display_header($tool_name, 'Groups'); if (isset($_POST['token']) && $_POST['token'] === $_SESSION['sec_token']) { if (isset($_POST['action'])) { - $title = $_POST['title']; + $title = isset($_POST['title']) ? $_POST['title'] : null; $content = $_POST['content']; $group_id = intval($_POST['group_id']); $parent_id = intval($_POST['parent_id']); @@ -138,7 +136,7 @@ if (isset($_POST['token']) && $_POST['token'] === $_SESSION['sec_token']) { $message = sprintf(get_lang('YouHaveReceivedANewMessageInTheGroupX'), $group_info['name'])."
$text_link"; foreach ($groups_user as $group_user) { - if ($group_user == $current_user) continue; + //if ($group_user == $current_user) continue; $group_user_info = api_get_user_info($group_user['user_id']); $recipient_name = api_get_person_name($group_user_info['firstName'], $group_user_info['lastName'], null, PERSON_NAME_EMAIL_ADDRESS); $recipient_email = $group_user_info['mail'];