composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

N°4824 Update consumers after swiftmailer/swiftmailer

Browse Source 
Multiple things to do as there were some changes in 6.0
Reference : https://github.com/swiftmailer/swiftmailer/blob/master/CHANGES#L107

* Fix "Call to undefined method Swift_Message::newInstance()" exception in notifications
* Fix removed Swift_MailTransport
This commit is contained in:
Pierre Goiffon
2022-05-03 09:01:56 +02:00
parent c5527c106c
commit 4646a05c7a
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/email.class.inc.php
View File

@@ -58,7 +58,7 @@ class EMail
public function __construct() public function __construct()
{ {
$this->m_aData = array(); $this->m_aData = array();
$this->m_oMessage = Swift_Message::newInstance(); $this->m_oMessage = new Swift_Message();
$this->SetRecipientFrom(MetaModel::GetConfig()->Get('email_default_sender_address'), MetaModel::GetConfig()->Get('email_default_sender_label')); $this->SetRecipientFrom(MetaModel::GetConfig()->Get('email_default_sender_address'), MetaModel::GetConfig()->Get('email_default_sender_label'));
} }
@@ -172,7 +172,7 @@ class EMail
$sUserName = self::$m_oConfig->Get('email_transport_smtp.username'); $sUserName = self::$m_oConfig->Get('email_transport_smtp.username');
$sPassword = self::$m_oConfig->Get('email_transport_smtp.password'); $sPassword = self::$m_oConfig->Get('email_transport_smtp.password');
$oTransport = Swift_SmtpTransport::newInstance($sHost, $sPort, $sEncryption); $oTransport = new Swift_SmtpTransport($sHost, $sPort, $sEncryption);
if (strlen($sUserName) > 0) if (strlen($sUserName) > 0)
{ {
$oTransport->setUsername($sUserName); $oTransport->setUsername($sUserName);
@@ -181,20 +181,20 @@ class EMail
break; break;
case 'Null': case 'Null':
$oTransport = Swift_NullTransport::newInstance(); $oTransport = new Swift_NullTransport();
break; break;
case 'LogFile': case 'LogFile':
$oTransport = Swift_LogFileTransport::newInstance(); $oTransport = new Swift_LogFileTransport();
$oTransport->setLogFile(APPROOT.'log/mail.log'); $oTransport->setLogFile(APPROOT.'log/mail.log');
break; break;
case 'PHPMail': case 'PHPMail':
default: default:
$oTransport = Swift_MailTransport::newInstance(); $oTransport = new Swift_SendmailTransport();
} }
$oMailer = Swift_Mailer::newInstance($oTransport); $oMailer = new Swift_Mailer($oTransport);
$aFailedRecipients = array(); $aFailedRecipients = array();
$this->m_oMessage->setMaxLineLength(0); $this->m_oMessage->setMaxLineLength(0);
@@ -364,7 +364,7 @@ class EMail
$this->m_aData['attachments'] = array(); $this->m_aData['attachments'] = array();
} }
$this->m_aData['attachments'][] = array('data' => base64_encode($data), 'filename' => $sFileName, 'mimeType' => $sMimeType); $this->m_aData['attachments'][] = array('data' => base64_encode($data), 'filename' => $sFileName, 'mimeType' => $sMimeType);
$this->m_oMessage->attach(Swift_Attachment::newInstance($data, $sFileName, $sMimeType)); $this->m_oMessage->attach(new Swift_Attachment($data, $sFileName, $sMimeType));
} }
public function SetSubject($sSubject) public function SetSubject($sSubject)