From e887fd7ba8c0fb4414489cfaf185987d5ac6347a Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 11 Jul 2012 15:36:27 -0400
Subject: [PATCH] Catch exceptions from PHPMailer

---
 lib/mail.php | 54 +++++++++++++++++++++++++++-------------------------
 1 file changed, 28 insertions(+), 26 deletions(-)

diff --git a/lib/mail.php b/lib/mail.php
index b46f73bd94..e218531afb 100644
--- 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);
-
 	}