From d7169d19cde6fc49e27e7444e424549212339ff9 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 12 Nov 2011 17:50:47 +0100
Subject: Replaced mail_send calls with new Mailer class

---
 inc/subscription.php | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'inc/subscription.php')

diff --git a/inc/subscription.php b/inc/subscription.php
index c94f17ad0..e9f17bc28 100644
--- a/inc/subscription.php
+++ b/inc/subscription.php
@@ -377,18 +377,16 @@ function subscription_send_list($subscriber_mail, $ids, $ns_id) {
  */
 function subscription_send($subscriber_mail, $replaces, $subject, $id, $template) {
     global $conf;
+    global $lang;
 
     $text = rawLocale($template);
-    $replaces = array_merge($replaces, array('TITLE'       => $conf['title'],
-                                             'DOKUWIKIURL' => DOKU_URL,
-                                             'PAGE'        => $id));
-
-    foreach ($replaces as $key => $substitution) {
-        $text = str_replace('@'.strtoupper($key).'@', $substitution, $text);
-    }
+    $trep = array_merge($replaces, array('PAGE' => $id));
 
-    global $lang;
     $subject = $lang['mail_' . $subject] . ' ' . $id;
-    mail_send('', '['.$conf['title'].'] '. $subject, $text,
-              $conf['mailfrom'], '', $subscriber_mail);
+    $mail = new Mailer();
+    $mail->bcc($subscriber_mail);
+    $mail->subject($subject);
+    $mail->setBody($text,$trep);
+
+    return $mail->send();
 }
-- 
cgit v1.2.3


From 9f3eca0b520fc5f689170108fbcbf490d12f2c2e Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 9 Mar 2012 12:44:28 +0100
Subject: Add various headers to the mails FS#2247. pull request #83 closed

---
 inc/subscription.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'inc/subscription.php')

diff --git a/inc/subscription.php b/inc/subscription.php
index e9f17bc28..d1ee0397a 100644
--- a/inc/subscription.php
+++ b/inc/subscription.php
@@ -387,6 +387,10 @@ function subscription_send($subscriber_mail, $replaces, $subject, $id, $template
     $mail->bcc($subscriber_mail);
     $mail->subject($subject);
     $mail->setBody($text,$trep);
-
+    $mail->setHeader(
+        'List-Unsubscribe',
+        '<'.wl($id,array('do'=>'subscribe'),true,'&').'>',
+        false
+    );
     return $mail->send();
 }
-- 
cgit v1.2.3