extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-23 06:19:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

give more detailed info about failure of addressbook mail - merge to frontend

Browse Source
This commit is contained in:
Klaus Leithoff 2013-08-06 14:07:00 +00:00
parent 37a810e6a4
commit 7b18fc9319
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
felamimail/inc/class.felamimail_bo.inc.php
View File

@ -2632,6 +2632,7 @@ class felamimail_bo
'mimeType' => ($_structure->type == 'TEXT' && $_structure->subType == 'HTML') ? 'text/html' : 'text/plain',
'charSet' => $this->getMimePartCharset($_structure),
);
//error_log(__METHOD__.__LINE__.array2string($bodyPart));
if ($_structure->type == 'TEXT' && $_structure->subType == 'PLAIN' &&
is_array($_structure->parameters) && isset($_structure->parameters['FORMAT']) &&
trim(strtolower($_structure->parameters['FORMAT']))=='flowed'
@ -5341,7 +5342,10 @@ class felamimail_bo
}
foreach ($SendAndMergeTocontacts as $k => $val)
{
$sendOK = $openComposeWindow = $openAsDraft = false;
$mailObject->ErrorInfo = $errorInfo = '';
//$mailObject->SMTPDebug = 5;
$mailObject->set('error_count',0);
$sendOK = $openComposeWindow = $openAsDraft = null;
//error_log(__METHOD__.__LINE__.' Id To Merge:'.$val);
if ($GLOBALS['egw_info']['flags']['currentapp'] == 'addressbook' &&
count($SendAndMergeTocontacts) > 1 &&
@ -5416,7 +5420,7 @@ class felamimail_bo
$errorInfo = $mailObject->ErrorInfo;
}
}
error_log(__METHOD__.__LINE__.array2string($errorInfo));
//error_log(__METHOD__.__LINE__.array2string($errorInfo));
}
}
elseif (!$k) // 1. entry, further entries will fail for apps other then addressbook
@ -5511,13 +5515,17 @@ class felamimail_bo
}
if ($sendOK)
{
$processStats['success'][] = 'Send succeeded to '.$nfn.'<'.$email.'>'.($savefailed?' but failed to store to Folder:'.$_folder:'');
$processStats['success'][$val] = 'Send succeeded to '.$nfn.'<'.$email.'>'.($savefailed?' but failed to store to Folder:'.$_folder:'');
}
else
{
if (!$openComposeWindow) $processStats['failed'][] = 'Send failed to '.$nfn.'<'.$email.'> See error_log for details';
if (!$openComposeWindow) $processStats['failed'][$val] = $errorInfo?$errorInfo:'Send failed to '.$nfn.'<'.$email.'> See error_log for details';
}
}
if (!is_null($sendOK) && $sendOK===false && is_null($openComposeWindow))
{
$processStats['failed'][$val] = $errorInfo?$errorInfo:'Send failed to '.$nfn.'<'.$email.'> See error_log for details';
}
}
}
unset($mailObject);
@ -5529,6 +5537,7 @@ class felamimail_bo
}
else
{
//error_log(__METHOD__.__LINE__.array2string($processStats));
return $processStats;
}
}