Do not show 500 error if email credentials are wrong, fixes #37 (#63)

DeutscherBundesjugendring · Nov 2, 2019 · b3d1f85 · b3d1f85
1 parent af269d5
commit b3d1f85
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 15 deletions.
diff --git a/application/modules/admin/controllers/MailQueuedController.php b/application/modules/admin/controllers/MailQueuedController.php
@@ -32,8 +32,11 @@ public function indexAction()
      */
     public function sendAllAction()
     {
-        (new Service_Email())->sendQueued();
-        $this->_flashMessenger->addMessage('All emails have been successfully sent.', 'success');
+        if ((new Service_Email())->sendQueued()) {
+            $this->_flashMessenger->addMessage('All emails have been successfully sent.', 'success');
+        } else {
+            $this->_flashMessenger->addMessage('There was an error when sending the emails.', 'error');
+        }
         $this->redirect($this->view->url(['action' => 'index']), ['prependBase' => false]);
     }
 }
diff --git a/application/services/Cron/Mail.php b/application/services/Cron/Mail.php
@@ -7,6 +7,8 @@ class Service_Cron_Mail extends Service_Cron
      */
     public function execute()
     {
-        (new Service_Email())->sendQueued();
+        if (!(new Service_Email())->sendQueued()) {
+            throw new Exception('There was an error when sending the emails');
+        }
     }
 }
diff --git a/application/services/Email.php b/application/services/Email.php
@@ -15,11 +15,7 @@ public function queueForSend(Dbjr_Mail $mail)
         return $this;
     }
 
-    /**
-     * Sends all unsent emails
-     * @return Service_Email   Provides fluent interface
-     */
-    public function sendQueued()
+    public function sendQueued(): bool
     {
         $mailModel = new Model_Mail();
         $emails = $mailModel->fetchAll(
@@ -51,14 +47,17 @@ public function sendQueued()
                     $mailer->addBcc($recipient->email, $recipient->name);
                 }
             }
-            $mailer->send();
-
-            $mailModel->update(
-                array('time_sent' => Zend_Date::now()->toString('YYYY-MM-dd HH:mm:ss')),
-                array('id=?' => $email->id)
-            );
+            try {
+                $mailer->send();
+                $mailModel->update(
+                    array('time_sent' => Zend_Date::now()->toString('YYYY-MM-dd HH:mm:ss')),
+                    array('id=?' => $email->id)
+                );
+            } catch (Zend_Mail_Protocol_Exception $e) {
+                return false;
+            }
         }
 
-        return $this;
+        return true;
     }
 }