Browse Source

Email message charset setup added.

tags/2.0.0-beta
Paul Klimov 11 years ago
parent
commit
99d8216103
  1. 20
      extensions/swiftmailer/yii/swiftmailer/Message.php
  2. 1
      framework/yii/mail/BaseMessage.php
  3. 6
      framework/yii/mail/MessageInterface.php
  4. 2
      tests/unit/framework/mail/BaseMailerTest.php

20
extensions/swiftmailer/yii/swiftmailer/Message.php

@ -42,6 +42,22 @@ class Message extends BaseMessage
/** /**
* @inheritdoc * @inheritdoc
*/ */
public function setCharset($charset)
{
$this->getSwiftMessage()->setCharset($charset);
}
/**
* @return string the character set of this message.
*/
public function getCharset()
{
return $this->getSwiftMessage()->getCharset();
}
/**
* @inheritdoc
*/
public function setFrom($from) public function setFrom($from)
{ {
$this->getSwiftMessage()->setFrom($from); $this->getSwiftMessage()->setFrom($from);
@ -232,8 +248,8 @@ class Message extends BaseMessage
{ {
$embedFile = \Swift_EmbeddedFile::newInstance($content); $embedFile = \Swift_EmbeddedFile::newInstance($content);
if (!empty($options['fileName'])) { if (!empty($options['fileName'])) {
$embedFile->setFilename($options['fileName']); $embedFile->setFilename($options['fileName']);
} }
if (!empty($options['contentType'])) { if (!empty($options['contentType'])) {
$embedFile->setContentType($options['contentType']); $embedFile->setContentType($options['contentType']);
} }

1
framework/yii/mail/BaseMessage.php

@ -21,6 +21,7 @@ use Yii;
* @see BaseMailer * @see BaseMailer
* *
* @property \yii\mail\BaseMailer $mailer mailer component instance. This property is read-only. * @property \yii\mail\BaseMailer $mailer mailer component instance. This property is read-only.
* @property string $charset the character set of this message.
* @property string|array $from sender email address. * @property string|array $from sender email address.
* @property string|array $to receiver email address. * @property string|array $to receiver email address.
* @property string|array $cc copy receiver email address. * @property string|array $cc copy receiver email address.

6
framework/yii/mail/MessageInterface.php

@ -16,6 +16,12 @@ namespace yii\mail;
interface MessageInterface interface MessageInterface
{ {
/** /**
* Set the character set of this message.
* @param string $charset character set name.
*/
public function setCharset($charset);
/**
* Sets message sender. * Sets message sender.
* @param string|array $from sender email address. * @param string|array $from sender email address.
* You may pass an array of addresses if this message is from multiple people. * You may pass an array of addresses if this message is from multiple people.

2
tests/unit/framework/mail/BaseMailerTest.php

@ -168,6 +168,8 @@ class Message extends BaseMessage
public $id; public $id;
public $encoding; public $encoding;
public function setCharset($charset) {}
public function setFrom($from) {} public function setFrom($from) {}
public function setTo($to) {} public function setTo($to) {}

Loading…
Cancel
Save