Catch exceptions from PHPMailer

diff --git a/lib/mail.php b/lib/mail.php
index b46f73bd94b86202c36b07d4bbb1235f7fa0654a..e218531afb2a0c2ee5cdd6b70749dba55636ea7e 100644 (file)
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -56,33 +56,35 @@ class OC_Mail {
                $mailo->From =$fromaddress;
                $mailo->FromName = $fromname;;
                $a=explode(' ',$toaddress);
-               foreach($a as $ad) {
-                       $mailo->AddAddress($ad,$toname);
+               try {
+                       foreach($a as $ad) {
+                               $mailo->AddAddress($ad,$toname);
+                       }
+
+                       if($ccaddress<>'') $mailo->AddCC($ccaddress,$ccname);
+                       if($bcc<>'') $mailo->AddBCC($bcc);
+
+                       $mailo->AddReplyTo($fromaddress, $fromname);
+
+                       $mailo->WordWrap = 50;
+                       if($html==1) $mailo->IsHTML(true); else $mailo->IsHTML(false);
+
+                       $mailo->Subject = $subject;
+                       if($altbody=='') {
+                               $mailo->Body    = $mailtext.OC_MAIL::getfooter();
+                               $mailo->AltBody = '';
+                       }else{
+                               $mailo->Body    = $mailtext;
+                               $mailo->AltBody = $altbody;
+                       }
+                       $mailo->CharSet = 'UTF-8';
+
+                       $mailo->Send();
+                       unset($mailo);
+                       OC_Log::write('Mail from '.$fromname.' ('.$fromaddress.')'.' to: '.$toname.'('.$toaddress.')'.' subject: '.$subject,'mail',OC_Log::DEBUG);
+               } catch (Exception $exception) {
+                       OC_Log::write('mail', $exception->getMessage(), OC_Log::DEBUG);
                }
-
-               if($ccaddress<>'') $mailo->AddCC($ccaddress,$ccname);
-               if($bcc<>'') $mailo->AddBCC($bcc);
-
-               $mailo->AddReplyTo($fromaddress, $fromname);
-
-               $mailo->WordWrap = 50;
-               if($html==1) $mailo->IsHTML(true); else $mailo->IsHTML(false);
-
-               $mailo->Subject = $subject;
-               if($altbody=='') {
-                       $mailo->Body    = $mailtext.OC_MAIL::getfooter();
-                       $mailo->AltBody = '';
-               }else{
-                       $mailo->Body    = $mailtext;
-                       $mailo->AltBody = $altbody;
-               }
-               $mailo->CharSet = 'UTF-8';
-
-               $mailo->Send();
-               unset($mailo);
-
-               OC_Log::write('Mail from '.$fromname.' ('.$fromaddress.')'.' to: '.$toname.'('.$toaddress.')'.' subject: '.$subject,'mail',OC_Log::DEBUG);
-
        }