From 05f5da993c227f12a99f33a616faf9f51c01b36e Mon Sep 17 00:00:00 2001 From: Jan Schneider Date: Wed, 22 Dec 2010 15:32:03 +0100 Subject: [PATCH] Use correct header names. Set body charset. --- framework/Alarm/lib/Horde/Alarm/Handler/Mail.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/framework/Alarm/lib/Horde/Alarm/Handler/Mail.php b/framework/Alarm/lib/Horde/Alarm/Handler/Mail.php index c389a78c9..b3c1d3c89 100644 --- a/framework/Alarm/lib/Horde/Alarm/Handler/Mail.php +++ b/framework/Alarm/lib/Horde/Alarm/Handler/Mail.php @@ -80,9 +80,9 @@ class Horde_Alarm_Handler_Mail extends Horde_Alarm_Handler } $mail = new Horde_Mime_Mail(array( - 'subject' => $alarm['title'], - 'to' => $email, - 'from' => $email, + 'Subject' => $alarm['title'], + 'To' => $email, + 'From' => $email, 'charset' => 'UTF-8' )); $mail->addHeader('Auto-Submitted', 'auto-generated'); @@ -90,9 +90,9 @@ class Horde_Alarm_Handler_Mail extends Horde_Alarm_Handler if (isset($alarm['params']['mail']['mimepart'])) { $mail->setBasePart($alarm['params']['mail']['mimepart']); } elseif (empty($alarm['params']['mail']['body'])) { - $mail->setBody($alarm['text']); + $mail->setBody($alarm['text'], 'UTF-8'); } else { - $mail->setBody($alarm['params']['mail']['body']); + $mail->setBody($alarm['params']['mail']['body'], 'UTF-8'); } $mail->send($this->_mail); -- 2.11.0