[geeklog-cvs] geeklog: Use different subjects for the comment notification and...

[geeklog-cvs at lists.geeklog.net]

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/9d8e5bdc110b
changeset: 7316:9d8e5bdc110b
user:      Dirk Haun <dirk at haun-online.de>
date:      Mon Sep 14 16:54:20 2009 +0200
description:
Use different subjects for the comment notification and comment _submission_ notification emails (cf. bug #0000957)

diffstat:

 public_html/docs/history |  4 ++--
 system/lib-comment.php   |  5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diffs (46 lines):

diff -r ff65ed5ec293 -r 9d8e5bdc110b public_html/docs/history
--- a/public_html/docs/history	Mon Sep 14 16:45:58 2009 +0200
+++ b/public_html/docs/history	Mon Sep 14 16:54:20 2009 +0200
@@ -3,8 +3,8 @@
 Oct ??, 2009 (1.6.1)
 ------------
 
-- When an anonymous commentor left a name, use it in the comment submission
-  notification email (bug #0000960) [Dirk]
+- When an anonymous commentor left a name, use it in the comment notification
+  email (bug #0000960) [Dirk]
 - Removed the CSRF token from all links to edit a comment. We only need it in
   the actual comment editor and it caused problems on the moderation page [Dirk]
 - For anonymous comments, use the anonymous user's name from the database, not
diff -r ff65ed5ec293 -r 9d8e5bdc110b system/lib-comment.php
--- a/system/lib-comment.php	Mon Sep 14 16:45:58 2009 +0200
+++ b/system/lib-comment.php	Mon Sep 14 16:54:20 2009 +0200
@@ -1235,7 +1235,7 @@
 */
 function CMT_sendNotification($title, $comment, $uid, $username, $ipaddress, $type, $cid)
 {
-    global $_CONF, $_TABLES, $LANG01, $LANG03, $LANG08, $LANG09;
+    global $_CONF, $_TABLES, $LANG01, $LANG03, $LANG08, $LANG09, $LANG29;
 
     // sanity check
     if (($username == $_SERVER['REMOTE_ADDR']) &&
@@ -1282,9 +1282,11 @@
     }
 
     if ($cid == 0) {
+        $mailsubject = $_CONF['site_name'] . ' ' . $LANG29[41];
         $mailbody .= $LANG01[10] . ' <' . $_CONF['site_admin_url']
                   . "/moderation.php>\n\n";
     } else {
+        $mailsubject = $_CONF['site_name'] . ' ' . $LANG03[9];
         $mailbody .= $LANG03[39] . ' <' . $_CONF['site_url']
                   . '/comment.php?mode=view&cid=' . $cid . ">\n\n";
     }
@@ -1293,7 +1295,6 @@
     $mailbody .= "\n$LANG08[34]\n";
     $mailbody .= "\n------------------------------\n";
 
-    $mailsubject = $_CONF['site_name'] . ' ' . $LANG03[9];
 
     return COM_mail($_CONF['site_mail'], $mailsubject, $mailbody);
 }