diff --git a/main/social/groups.php b/main/social/groups.php
index 462d8e526f..68bed59d14 100755
--- a/main/social/groups.php
+++ b/main/social/groups.php
@@ -155,6 +155,27 @@ if (isset($_POST['token']) && $_POST['token'] === $_SESSION['sec_token']) {
if (is_string($res)) {
Display::display_error_message($res);
}
+
+ if ($res === true) {
+ $groups_user = GroupPortalManager::get_users_by_group($group_id);
+ $group_info = GroupPortalManager::get_group_data($group_id);
+ $admin_user_info = api_get_user_info(1);
+ $sender_name = api_get_person_name($admin_user_info['lastName'], $admin_user_info['firstName'], null, PERSON_NAME_EMAIL_ADDRESS);
+ $sender_email = $admin_user_info['mail'];
+ $subject = sprintf(get_lang('ThereIsANewMessageInTheGroupX'),$group_info['name']);
+ $link = api_get_path(WEB_PATH).'main/social/groups?'.$_SERVER['QUERY_STRING'];
+ $text_link = ''.get_lang('ClickHereToSeeMessageGroup')."
\r\n
\r\n".get_lang('OrCopyPasteTheFollowingUrl')."
\r\n ".$link;
+
+ $message = sprintf(get_lang('YouHaveReceivedANewMessageInTheGroupX'),$group_info['name'])."
$text_link";
+
+ foreach ($groups_user as $group_user) {
+ 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['lastName'], $group_user_info['firstName'], null, PERSON_NAME_EMAIL_ADDRESS);
+ $recipient_email = $group_user_info['mail'];
+ api_mail_html($recipient_name, $recipient_email, stripslashes($subject), $message, $sender_name, $sender_email);
+ }
+ }
Security::clear_token();
}
diff --git a/main/social/message_for_group_form.inc.php b/main/social/message_for_group_form.inc.php
index ec1086a326..8b8f82c100 100755
--- a/main/social/message_for_group_form.inc.php
+++ b/main/social/message_for_group_form.inc.php
@@ -53,7 +53,9 @@ if (!empty($group_id) && $allowed_action) {
}
}
-$param_item_page = isset($_GET['items_page_nr']) && isset($_GET['topic_id'])?('&items_'.intval($_GET['topic_id']).'_page_nr='.$_GET['items_page_nr']):'';
+$page_item = !empty($_GET['topics_page_nr'])?intval($_GET['topics_page_nr']):1;
+
+$param_item_page = isset($_GET['items_page_nr']) && isset($_GET['topic_id'])?('&items_'.intval($_GET['topic_id']).'_page_nr='.(!empty($_GET['topics_page_nr'])?intval($_GET['topics_page_nr']):1)):'';
$page_topic = !empty($_GET['topics_page_nr'])?intval($_GET['topics_page_nr']):1;
?>