From d2a851931f3cb288c3ebf6eb6d3655dee9c4b3d3 Mon Sep 17 00:00:00 2001 From: Klaus Leithoff Date: Wed, 7 Aug 2013 08:07:24 +0000 Subject: [PATCH] provide contact-id on errormessage on failure of mail-merge --- etemplate/inc/class.bo_merge.inc.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/etemplate/inc/class.bo_merge.inc.php b/etemplate/inc/class.bo_merge.inc.php index 15112730e6..c163f0db46 100644 --- a/etemplate/inc/class.bo_merge.inc.php +++ b/etemplate/inc/class.bo_merge.inc.php @@ -1440,7 +1440,11 @@ abstract class bo_merge $retString = ''; if (count($msgs['success'])>0) $retString .= count($msgs['success']).' '.(count($msgs['success'])+count($msgs['failed'])==1?lang('Message prepared for sending.'):lang('Message(s) send ok.'));//implode('
',$msgs['success']); //if (strlen($retString)>0) $retString .= '
'; - if (count($msgs['failed'])>0) $retString .= count($msgs['failed']).' '.lang('Message(s) send failed!').'=>'.implode(', ',$msgs['failed']); + foreach($msgs['failed'] as $c =>$e) + { + $errorString .= lang('contact').' '.lang('id').':'.$c.'->'.$e.'.'; + } + if (count($msgs['failed'])>0) $retString .= count($msgs['failed']).' '.lang('Message(s) send failed!').'=>'.$errorString; return $retString; break; case 'application/vnd.oasis.opendocument.text':