From 0cde0aee34a658e8059106ee51641cac2f48d92a Mon Sep 17 00:00:00 2001 From: Adam Date: Sat, 22 Dec 2012 09:10:32 -0500 Subject: [PATCH] Fixed memo mail messages, and allow %N to be in them. Bug #1462 --- modules/pseudoclients/memoserv.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/pseudoclients/memoserv.cpp b/modules/pseudoclients/memoserv.cpp index e1565ab67..350280caa 100644 --- a/modules/pseudoclients/memoserv.cpp +++ b/modules/pseudoclients/memoserv.cpp @@ -21,13 +21,15 @@ static bool SendMemoMail(NickCore *nc, MemoInfo *mi, Memo *m) subject = subject.replace_all_cs("%n", nc->display); subject = subject.replace_all_cs("%s", m->sender); - subject = subject.replace_all_cs("%d", mi->GetIndex(m)); + subject = subject.replace_all_cs("%d", stringify(mi->GetIndex(m) + 1)); subject = subject.replace_all_cs("%t", m->text); + subject = subject.replace_all_cs("%N", Config->NetworkName); message = message.replace_all_cs("%n", nc->display); message = message.replace_all_cs("%s", m->sender); - message = message.replace_all_cs("%d", mi->GetIndex(m)); + message = message.replace_all_cs("%d", stringify(mi->GetIndex(m) + 1)); message = message.replace_all_cs("%t", m->text); + message = message.replace_all_cs("%N", Config->NetworkName); return Mail::Send(nc, subject, message); }