From ffb3750806bec7bb517c951ca4b21df91fd024cd Mon Sep 17 00:00:00 2001
From: Romain Quetiez <romain.quetiez@combodo.com>
Date: Thu, 20 Oct 2011 15:52:38 +0000
Subject: [PATCH] Fixed regressions due to the integration of SwiftMailer

SVN:trunk[1639]
---
 core/action.class.inc.php | 10 +++++-----
 core/email.class.inc.php  |  5 +++++
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/core/action.class.inc.php b/core/action.class.inc.php
index 07f8ac3cc..aea272719 100644
--- a/core/action.class.inc.php
+++ b/core/action.class.inc.php
@@ -275,7 +275,6 @@ class ActionEmail extends ActionNotification
 	protected function _DoExecute($oTrigger, $aContextArgs, &$oLog)
 	{
 		$sPreviousUrlMaker = ApplicationContext::SetUrlMakerClass();
-		$aHeaders = array();
 		try
 		{
 			$this->m_iRecipients = 0;
@@ -295,9 +294,8 @@ class ActionEmail extends ActionNotification
 			$sBody = MetaModel::ApplyParams($this->Get('body'), $aContextArgs);
 			
 			$oObj = $aContextArgs['this->object()'];
-			$sMessageId = sprintf('<iTop_%s_%d_%f@%s.openitop.org>', get_class($oObj), $oObj->GetKey(), microtime(true /* get as float*/), MetaModel::GetConfig()->Get('session_name'));
-			$sReference = $sMessageId;
-			$aHeaders['Message-ID'] = $sMessageId;
+			$sMessageId = sprintf('iTop_%s_%d_%f@%s.openitop.org', get_class($oObj), $oObj->GetKey(), microtime(true /* get as float*/), MetaModel::GetConfig()->Get('session_name'));
+			$sReference = '<'.$sMessageId.'>';
 		}
 		catch(Exception $e)
 		{
@@ -318,7 +316,7 @@ class ActionEmail extends ActionNotification
 			if (isset($sBody))     $oLog->Set('body', $sBody);
 		}
 
-		$oEmail = new EMail('', '', '', $aHeaders);
+		$oEmail = new EMail();
 
 		if ($this->IsBeingTested())
 		{
@@ -341,6 +339,7 @@ class ActionEmail extends ActionNotification
 			$oEmail->SetRecipientTO($this->Get('test_recipient'));
 			$oEmail->SetRecipientFrom($this->Get('test_recipient'));
 			$oEmail->SetReferences($sReference);
+			$oEmail->SetMessageId($sMessageId);
 		}
 		else
 		{
@@ -352,6 +351,7 @@ class ActionEmail extends ActionNotification
 			$oEmail->SetRecipientFrom($sFrom);
 			$oEmail->SetRecipientReplyTo($sReplyTo);
 			$oEmail->SetReferences($sReference);
+			$oEmail->SetMessageId($sMessageId);
 		}
 
 		if (empty($this->m_aMailErrors))
diff --git a/core/email.class.inc.php b/core/email.class.inc.php
index 857b265bf..706f11975 100644
--- a/core/email.class.inc.php
+++ b/core/email.class.inc.php
@@ -163,6 +163,11 @@ class EMail
 		$this->m_oMessage->addPart($sText, $sMimeType);
 	}
 
+	public function AddAttachment($data, $sFileName, $sMimeType)
+	{
+		$this->m_oMessage->attach(Swift_Attachment::newInstance($data, $sFileName, $sMimeType));
+	}
+
 	public function SetSubject($aSubject)
 	{
 		$this->m_oMessage->setSubject($aSubject);