holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

provide contact-id on errormessage on failure of mail-merge

Browse Source
This commit is contained in:
Klaus Leithoff 2013-08-07 08:07:24 +00:00
parent b70f4bcd27
commit d2a851931f
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
etemplate/inc/class.bo_merge.inc.php
View File

@ -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('<br />',$msgs['success']);
//if (strlen($retString)>0) $retString .= '<br />';
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':