Ticket #918

inc/classes/BxDolCmts.php

@@ -1326,14 +1326,20 @@ class BxDolCmts extends BxDolFactory implements iBxDolReplaceable, iBxDolContent
         $aAccount = BxDolAccount::getInstance($iAccount)->getInfo();
 
         $aPlus = array();
+        $aPlus['sender_display_name'] = $oProfile->getDisplayName();
         $aPlus['reply_text'] = $this->_prepareTextForOutput($aCmt['cmt_text'], $iCmtId);
 
-        $sViewUrl = $this->getBaseUrl();
-        if(!empty($sViewUrl))
-            $sViewUrl .= $this->getItemAnchor($iCmtParentId, true);
+        $sPageUrl = $this->getBaseUrl();
+        if(empty($sPageUrl))
+            $sPageUrl = $this->getViewUrl($iCmtParentId);
         else 
-            $sViewUrl = $this->getViewUrl($iCmtParentId);
-        $aPlus['comment_url'] = $sViewUrl;
+            $sPageUrl .= $this->getItemAnchor($iCmtParentId, true);
+        $aPlus['page_url'] = $sPageUrl;
+
+        $sPageTitle = $this->getObjectTitle();
+        if(empty($sPageTitle))
+            $sPageTitle = _t('_Content');
+        $aPlus['page_title'] = $sPageTitle;
 
         $aTemplate = BxDolEmailTemplates::getInstance()->parseTemplate('t_CommentReplied', $aPlus);
         return $aTemplate && sendMail($aAccount['email'], $aTemplate['Subject'], $aTemplate['Body']);

modules/boonex/convos/classes/BxCnvModule.php

@@ -288,7 +288,8 @@ class BxCnvModule extends BxBaseModTextModule
                 sendMailTemplate('bx_cnv_new_reply', 0, $iCollaborator, array(
                     'SenderDisplayName' => $oProfile->getDisplayName(),
                     'SenderUrl' => $oProfile->getUrl(),
-                	'ReplyUrl' => $oCmts->getItemUrl($iCommentId),
+                    'PageUrl' => $oCmts->getItemUrl($iCommentId),
+                    'PageTitle' => $oCmts->getObjectTitle(),
                     'Message' => $sCommentText,
                 ), BX_EMAIL_NOTIFY);
             }

modules/boonex/convos/install/langs/en.xml

@@ -126,9 +126,9 @@
 {email_footer}]]></string>
 
     <string name="_bx_cnv_email_new_reply"><![CDATA[New reply]]></string>
-    <string name="_bx_cnv_email_new_reply_subject"><![CDATA[New reply from {SenderDisplayName}]]></string>
+    <string name="_bx_cnv_email_new_reply_subject"><![CDATA[New reply in conversation from {SenderDisplayName}]]></string>
     <string name="_bx_cnv_email_new_reply_body"><![CDATA[{email_header}
-<p>New <a href="{ReplyUrl}">reply</a> from <a href="{SenderUrl}">{SenderDisplayName}</a>:</p>
+<p>New reply in <a href="{PageUrl}">{PageTitle}</a> conversation from <a href="{SenderUrl}">{SenderDisplayName}</a>:</p>
 <hr />
 <p>{Message}</p>
 {email_footer}]]></string>

modules/boonex/english/data/langs/system/en.xml

@@ -1677,9 +1677,8 @@ If it is not enabled then please consider implement this optimization, since it
 {email_footer}]]></string>
 	<string name="_sys_et_txt_body_comment_replied"><![CDATA[{email_header}
 <p>Hello,</p>
-<p>Your comment was replied. It reads:</p>
+<p>Your comment was replied on <a href="{page_url}">{page_title}</a> page. It reads:</p>
 <p>{reply_text}</p>
-<p>Please refer to comment page for more details <a href="{comment_url}">here</a>.</p>
 {email_footer}]]></string>
 	<string name="_sys_et_txt_body_system_reported"><![CDATA[{email_header}
 <p>Hello,</p>
@@ -1782,7 +1781,7 @@ If it is not enabled then please consider implement this optimization, since it
 	<string name="_sys_et_txt_name_upgrade_modules_success"><![CDATA[Modules upgrade success]]></string>
 	<string name="_sys_et_txt_name_bg_operation_failed"><![CDATA[Background operation failed]]></string>
 	<string name="_sys_et_txt_subject_admin_email"><![CDATA[Message from <SiteName> Admin: <MessageSubject>]]></string>
-	<string name="_sys_et_txt_subject_comment_replied"><![CDATA[Your comment was replied]]></string>
+	<string name="_sys_et_txt_subject_comment_replied"><![CDATA[Your comment was replied by {sender_display_name}]]></string>
 	<string name="_sys_et_txt_subject_system_reported"><![CDATA[New report notification]]></string>
 	<string name="_sys_et_txt_subject_confirmation"><![CDATA[Confirm Your Email (ACTION REQUIRED)]]></string>
 	<string name="_sys_et_txt_subject_delayed_module_uninstall"><![CDATA[Delayed {Module} module uninstall: {Result}]]></string>

modules/boonex/forum/classes/BxForumModule.php

@@ -340,11 +340,12 @@ class BxForumModule extends BxBaseModTextModule
         // send notification to author
         if($iProfileId != $aContentInfo[$CNF['FIELD_AUTHOR']]) {
 	        $oProfile = BxDolProfile::getInstance($iProfileId);
-	        if($oProfile)
+	        if($oProfile) 
                 sendMailTemplate('bx_forum_new_reply', 0, $aContentInfo[$CNF['FIELD_AUTHOR']], array(
                     'SenderDisplayName' => $oProfile->getDisplayName(),
                     'SenderUrl' => $oProfile->getUrl(),
-                    'ReplyUrl' => $oCmts->getItemUrl($iCommentId),
+                    'PageUrl' => $oCmts->getItemUrl($iCommentId),
+                    'PageTitle' => $oCmts->getObjectTitle(),
                     'Message' => $sCommentText,
                 ), BX_EMAIL_NOTIFY);
         }

modules/boonex/forum/install/langs/en.xml

@@ -262,9 +262,9 @@
     
     
     <string name="_bx_forum_email_new_reply"><![CDATA[New reply]]></string>
-    <string name="_bx_forum_email_new_reply_subject"><![CDATA[New reply from {SenderDisplayName}]]></string>
+    <string name="_bx_forum_email_new_reply_subject"><![CDATA[New reply in "{PageTitle}" discussion]]></string>
     <string name="_bx_forum_email_new_reply_body"><![CDATA[{email_header}
-<p>New <a href="{ReplyUrl}">reply</a> from <a href="{SenderUrl}">{SenderDisplayName}</a>:</p>
+<p>New reply in <a href="{PageUrl}">{PageTitle}</a> discussion from <a href="{SenderUrl}">{SenderDisplayName}</a>:</p>
 <hr />
 <p>{Message}</p>
 {email_footer}]]></string>

modules/boonex/russian/data/langs/bx_convos/ru.xml

@@ -126,9 +126,9 @@
 {email_footer}]]></string>
 
     <string name="_bx_cnv_email_new_reply"><![CDATA[Новый ответ]]></string>
-    <string name="_bx_cnv_email_new_reply_subject"><![CDATA[Новый ответ от {SenderDisplayName}]]></string>
+    <string name="_bx_cnv_email_new_reply_subject"><![CDATA[Новый ответ в переписке от {SenderDisplayName}]]></string>
     <string name="_bx_cnv_email_new_reply_body"><![CDATA[{email_header}
-<p>Новый <a href="{ReplyUrl}">ответ</a> от <a href="{SenderUrl}">{SenderDisplayName}</a>:</p>
+<p>Новый ответ в <a href="{PageUrl}">{PageTitle}</a> переписке от <a href="{SenderUrl}">{SenderDisplayName}</a>:</p>
 <hr />
 <p>{Message}</p>
 {email_footer}]]></string>

modules/boonex/russian/data/langs/bx_forum/ru.xml

@@ -261,9 +261,9 @@
     <string name="_bx_forum_you_are_last_replier"><![CDATA[Вы - последний ответивший]]></string>
 
     <string name="_bx_forum_email_new_reply"><![CDATA[Новый ответ]]></string>
-    <string name="_bx_forum_email_new_reply_subject"><![CDATA[Новый ответ от {SenderDisplayName}]]></string>
+    <string name="_bx_forum_email_new_reply_subject"><![CDATA[Новый ответ в "{PageTitle}" дискуссии]]></string>
     <string name="_bx_forum_email_new_reply_body"><![CDATA[{email_header}
-<p>Новый <a href="{ReplyUrl}">ответ</a> от <a href="{SenderUrl}">{SenderDisplayName}</a>:</p>
+<p>Новый ответ в <a href="{PageUrl}">{PageTitle}</a> дискуссии от <a href="{SenderUrl}">{SenderDisplayName}</a>:</p>
 <hr />
 <p>{Message}</p>
 {email_footer}]]></string>

modules/boonex/russian/data/langs/system/ru.xml

@@ -1675,9 +1675,8 @@
 {email_footer}]]></string>
 	<string name="_sys_et_txt_body_comment_replied"><![CDATA[{email_header}
 <p>Привет,</p>
-<p>На Ваш комментарий ответили. Ответ:</p>
+<p>На Ваш комментарий ответили на <a href="{page_url}">{page_title}</a> странице. Ответ:</p>
 <p>{reply_text}</p>
-<p>Пожалуйста, перейдите на <a href="{comment_url}">страницу комментария</a> для получения дополнительной информации.</p>
 {email_footer}]]></string>
 	<string name="_sys_et_txt_body_system_reported"><![CDATA[{email_header}
 <p>Привет,</p>
@@ -1780,7 +1779,7 @@
 	<string name="_sys_et_txt_name_upgrade_modules_success"><![CDATA[Обновление модулей прошло удачно]]></string>
 	<string name="_sys_et_txt_name_bg_operation_failed"><![CDATA[Фоновая операция не удалась]]></string>
 	<string name="_sys_et_txt_subject_admin_email"><![CDATA[Сообщение от администратора сайта <SiteName>: <MessageSubject>]]></string>
-	<string name="_sys_et_txt_subject_comment_replied"><![CDATA[Ваш комментарий был отвечен]]></string>
+	<string name="_sys_et_txt_subject_comment_replied"><![CDATA[{sender_display_name} ответил на Ваш комментарий]]></string>
 	<string name="_sys_et_txt_subject_system_reported"><![CDATA[Уведомление о новой жалобе]]></string>
 	<string name="_sys_et_txt_subject_confirmation"><![CDATA[Подтвердите свой эл. адрес (ОБЯЗАТЕЛЬНО)]]></string>
 	<string name="_sys_et_txt_subject_delayed_module_uninstall"><![CDATA[Отложенный демонтаж модуля {Module}: {Result}]]></string>