From ea0f1a7ed5ce2bea36f2a852ce1c578f20c9560b Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Thu, 16 Feb 2012 14:37:01 +0000 Subject: [PATCH] ignore exception while sending notification to admin (eg. SMTP error), to block the account and give a correct error-message to user --- phpgwapi/inc/class.egw_session.inc.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/phpgwapi/inc/class.egw_session.inc.php b/phpgwapi/inc/class.egw_session.inc.php index 1b5c65e4de..c1582de60d 100644 --- a/phpgwapi/inc/class.egw_session.inc.php +++ b/phpgwapi/inc/class.egw_session.inc.php @@ -710,11 +710,16 @@ class egw_session $subject = lang("eGroupWare: login blocked for user '%1', IP %2",$login,$ip); $body = lang("Too many unsucessful attempts to login: %1 for the user '%2', %3 for the IP %4",$false_id,$login,$false_ip,$ip); - $subject = $GLOBALS['egw']->send->encode_subject($subject); $admin_mails = explode(',',$GLOBALS['egw_info']['server']['admin_mails']); foreach($admin_mails as $to) { - $GLOBALS['egw']->send->msg('email',$to,$subject,$body,'','','',$from,$from); + try { + $GLOBALS['egw']->send->msg('email',$to,$subject,$body,'','','',$from,$from); + } + catch(Exception $e) { + // ignore exception, but log it, to block the account and give a correct error-message to user + error_log(__METHOD__."('$log', '$ip') ".$e->getMessage()); + } } // save time of mail, to not send to many mails $config = new config('phpgwapi');