Merge branch 'release/2.6.1'

getgrav · Sep 7, 2017 · 75c588d · 75c588d
2 parents e406231 + 941c538
commit 75c588d
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# v2.6.1
+## 09/07/2017
+
+1. [](#improved)
+    * Improved the error message when missing `from` in the configuration
+    * Silently catch malformed email exceptions
+
 # v2.6.0
 ## 05/22/2017
 

diff --git a/blueprints.yaml b/blueprints.yaml
@@ -1,5 +1,5 @@
 name: Email
-version: 2.6.0
+version: 2.6.1
 description: Enables the emailing system for Grav
 icon: envelope
 author:

diff --git a/classes/Utils.php b/classes/Utils.php
@@ -30,7 +30,7 @@ public static function sendEmail($subject, $content, $to, $from = null, $mimetyp
         }
 
         if (!isset($grav['Email']) || empty($from)) {
-            throw new \RuntimeException($grav['language']->translate('PLUGIN_EMAIL.EMAIL_NOT_CONFIGURED'));
+            throw new \RuntimeException($grav['language']->translate('PLUGIN_EMAIL.PLEASE_CONFIGURE_A_FROM_ADDRESS'));
         }
 
         if (empty($to) || empty($subject) || empty($content)) {

diff --git a/email.php b/email.php
@@ -5,6 +5,7 @@
 use Grav\Common\Twig\Twig;
 use Grav\Plugin\Email\Email;
 use RocketTheme\Toolbox\Event\Event;
+use Swift_RfcComplianceException;
 
 class EmailPlugin extends Plugin
 {
@@ -141,7 +142,11 @@ protected function buildMessage(array $params, array $vars = array())
             switch ($key) {
                 case 'bcc':
                     foreach ($this->parseAddressValue($value, $vars) as $address) {
-                        $message->addBcc($address->mail, $address->name);
+                        try {
+                            $message->addBcc($address->mail, $address->name);
+                        } catch (Swift_RfcComplianceException $e) {
+                            continue;
+                        }
                     }
                     break;
 
@@ -195,7 +200,11 @@ protected function buildMessage(array $params, array $vars = array())
                     }
 
                     foreach ($this->parseAddressValue($value, $vars) as $address) {
-                        $message->addCc($address->mail, $address->name);
+                        try {
+                            $message->addCc($address->mail, $address->name);
+                        } catch (Swift_RfcComplianceException $e) {
+                            continue;
+                        }
                     }
                     break;
 
@@ -208,7 +217,11 @@ protected function buildMessage(array $params, array $vars = array())
                     }
 
                     foreach ($this->parseAddressValue($value, $vars) as $address) {
-                        $message->addFrom($address->mail, $address->name);
+                        try {
+                            $message->addFrom($address->mail, $address->name);
+                        } catch (Swift_RfcComplianceException $e) {
+                            continue;
+                        }
                     }
                     break;
 
@@ -221,7 +234,11 @@ protected function buildMessage(array $params, array $vars = array())
                     }
 
                     foreach ($this->parseAddressValue($value, $vars) as $address) {
-                        $message->addReplyTo($address->mail, $address->name);
+                        try {
+                            $message->addReplyTo($address->mail, $address->name);
+                        } catch (Swift_RfcComplianceException $e) {
+                            continue;
+                        }
                     }
                     break;
 
@@ -238,7 +255,11 @@ protected function buildMessage(array $params, array $vars = array())
                     }
 
                     foreach ($this->parseAddressValue($value, $vars) as $address) {
-                        $message->addTo($address->mail, $address->name);
+                        try {
+                            $message->addTo($address->mail, $address->name);
+                        } catch (Swift_RfcComplianceException $e) {
+                            continue;
+                        }
                     }
                     break;
             }