extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-21 23:43:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Keep warnings when adding errors to notification

Browse Source
This commit is contained in:
Nathan Gray 2011-12-19 22:22:29 +00:00
parent 4efa3dd4ae
commit b8955a1ab0
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
importexport/inc/class.importexport_schedule_ui.inc.php
View File

@ -557,24 +557,27 @@
$notify->set_sender($data['account_id']);
$notify->add_receiver($data['account_id']);
$notify->set_subject(lang('Schedule import | export'). ' ' . lang('errors'));
$contents = '';
if($data['warnings'])
{
$contents = lang($data['type']) . ' ' . lang('Warnings') . ' ' . egw_time::to() . ':';
$contents .= lang($data['type']) . ' ' . lang('Warnings') . ' ' . egw_time::to() . ':';
foreach($data['warnings'] as $target => $message)
{
$contents .= "\n". (is_numeric($target) ? '' : $target."\n");
$contents .= is_array($message) ? implode("\n",$message) : $message;
}
$contents .= "\n";
}
if($data['errors'])
{
$contents = lang($data['type']) . ' ' . lang('Errors') . ' ' . egw_time::to() . ':';
$contents .= lang($data['type']) . ' ' . lang('Errors') . ' ' . egw_time::to() . ':';
foreach($data['errors'] as $target => $errors)
{
$contents .= "\n". (is_numeric($target) ? '' : $target."\n");
$contents .= is_array($errors) ? implode("\n",$errors) : $errors;
}
$contents .= "\n";
}
$notify->set_message($contents);
$notify->send();