From: Jan Schneider <jan@horde.org>
Date: Wed, 7 Jan 2009 18:11:17 +0000 (+0100)
Subject: Use all credentials and settings from IMP's mailer configuration (Bug #7388).
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=f21bacb50bcbf11f40b1fa6d046ec8a6a0e36d6f;p=horde.git

Use all credentials and settings from IMP's mailer configuration (Bug #7388).
---

diff --git a/imp/lib/Mime/Viewer/itip.php b/imp/lib/Mime/Viewer/itip.php
index 8ded83211..cccbd50df 100644
--- a/imp/lib/Mime/Viewer/itip.php
+++ b/imp/lib/Mime/Viewer/itip.php
@@ -336,9 +336,10 @@ class IMP_Horde_Mime_Viewer_itip extends Horde_Mime_Viewer_Driver
                     $msg_headers->addHeader('Subject', Horde_Mime::encode($subject, $charset));
 
                     // Send the reply.
+                    $mail_driver = IMP_Compose::getMailDriver();
                     $status = $mime->send($organizerEmail, $msg_headers,
-                                          $GLOBALS['conf']['mailer']['type'],
-                                          $GLOBALS['conf']['mailer']['params']);
+                                          $mail_driver['driver'],
+                                          $mail_driver['params']);
                     if (is_a($status, 'PEAR_Error')) {
                         $msgs[] = array('error', sprintf(_("Error sending reply: %s."), $status->getMessage()));
                     } else {
@@ -437,9 +438,10 @@ class IMP_Horde_Mime_Viewer_itip extends Horde_Mime_Viewer_Driver
                     $msg_headers->addHeader('Subject', Horde_Mime::encode(_("Free/Busy Request Response"), $charset));
 
                     // Send the reply.
+                    $mail_driver = IMP_Compose::getMailDriver();
                     $status = $mime->send($organizerEmail, $msg_headers,
-                                          $GLOBALS['conf']['mailer']['type'],
-                                          $GLOBALS['conf']['mailer']['params']);
+                                          $mail_driver['driver'],
+                                          $mail_driver['params']);
                     if (is_a($status, 'PEAR_Error')) {
                         $msgs[] = array('error', sprintf(_("Error sending reply: %s."), $status->getMessage()));
                     } else {