Adding forum and thread title when sending notifications see BT#3304

main/forum/forumfunction.inc.php

@@ -3928,8 +3928,7 @@ function get_notifications($content,$id) {
 function send_notifications($forum_id = 0, $thread_id = 0, $post_id = 0) {
     global $_course, $_user;
 
-    // The content of the mail
-    $email_subject = get_lang('NewForumPost').' - '.$_course['official_code'];
+    // The content of the mail    
     $thread_link = api_get_path(WEB_CODE_PATH).'forum/viewthread.php?'.api_get_cidreq().'&gidReq='.Security::remove_XSS($_GET['gidReq']).'&forum='.$forum_id.'&thread='.$thread_id;
     $my_link = isset($link) ? $link : '';
     $my_message = isset($message) ? $message : '';
@@ -3941,6 +3940,12 @@ function send_notifications($forum_id = 0, $thread_id = 0, $post_id = 0) {
     } else {
         return false;
     }
+    
+    $current_thread = get_thread_information($thread_id);    
+    $current_forum  = get_forum_information($current_thread['forum_id']);
+    
+    $email_subject = get_lang('NewForumPost').' - '.$_course['official_code'].' - '.$current_forum['forum_title'].' - '.$current_thread['thread_title'];
+    
 
     // User who subscribed to the thread
     if ($thread_id != 0) {
@@ -3955,9 +3960,12 @@ function send_notifications($forum_id = 0, $thread_id = 0, $post_id = 0) {
             if ($value['email'] != $_user['email']) {
                 $email_body = api_get_person_name($value['firstname'], $value['lastname'], null, PERSON_NAME_EMAIL_ADDRESS)."\n\r";
                 $email_body .= '['.$_course['official_code'].'] - ['.$_course['name']."]<br />\n";
-                $email_body .= get_lang('NewForumPost')."\n";
+                $email_body .= get_lang('NewForumPost').": ";
+                
+                $email_body .= $current_forum['forum_title'].' - '.$current_thread['thread_title']."<br />\n";
+                
                 $email_body .= get_lang('YouWantedToStayInformed')."<br /><br />\n";
-                $email_body .= get_lang('ThreadCanBeFoundHere')." : <a href=\"".$thread_link."\">".$thread_link."</a>\n";
+                $email_body .= get_lang('ThreadCanBeFoundHere')." : <a href=\"".$thread_link."\">".$thread_link."</a>\n";                
                 @api_mail_html(api_get_person_name($value['firstname'], $value['lastname'], null, PERSON_NAME_EMAIL_ADDRESS), $value['email'], $email_subject, $email_body, api_get_person_name($_SESSION['_user']['firstName'], $_SESSION['_user']['lastName'], null, PERSON_NAME_EMAIL_ADDRESS), $_SESSION['_user']['mail']);
             }
         }