Display the author in email notifications

This commit is contained in:
Frederic Guillot 2015-04-07 20:21:27 -04:00
parent e41495a06c
commit 4325679a70
18 changed files with 25 additions and 1 deletions

View File

@ -846,4 +846,5 @@ return array(
// 'Secret key: ' => '',
// 'Test your device' => '',
// 'Assign a color when the task is moved to a specific column' => '',
// '%s via Kanboard' => '',
);

View File

@ -846,4 +846,5 @@ return array(
// 'Secret key: ' => '',
// 'Test your device' => '',
// 'Assign a color when the task is moved to a specific column' => '',
// '%s via Kanboard' => '',
);

View File

@ -846,4 +846,5 @@ return array(
// 'Secret key: ' => '',
// 'Test your device' => '',
// 'Assign a color when the task is moved to a specific column' => '',
// '%s via Kanboard' => '',
);

View File

@ -846,4 +846,5 @@ return array(
// 'Secret key: ' => '',
// 'Test your device' => '',
// 'Assign a color when the task is moved to a specific column' => '',
// '%s via Kanboard' => '',
);

View File

@ -848,4 +848,5 @@ return array(
'Secret key: ' => 'Clé secrète : ',
'Test your device' => 'Testez votre appareil',
'Assign a color when the task is moved to a specific column' => 'Assigner une couleur lorsque la tâche est déplacée dans une colonne spécifique',
'%s via Kanboard' => '%s via Kanboard',
);

View File

@ -846,4 +846,5 @@ return array(
// 'Secret key: ' => '',
// 'Test your device' => '',
// 'Assign a color when the task is moved to a specific column' => '',
// '%s via Kanboard' => '',
);

View File

@ -846,4 +846,5 @@ return array(
// 'Secret key: ' => '',
// 'Test your device' => '',
// 'Assign a color when the task is moved to a specific column' => '',
// '%s via Kanboard' => '',
);

View File

@ -846,4 +846,5 @@ return array(
// 'Secret key: ' => '',
// 'Test your device' => '',
// 'Assign a color when the task is moved to a specific column' => '',
// '%s via Kanboard' => '',
);

View File

@ -846,4 +846,5 @@ return array(
// 'Secret key: ' => '',
// 'Test your device' => '',
// 'Assign a color when the task is moved to a specific column' => '',
// '%s via Kanboard' => '',
);

View File

@ -846,4 +846,5 @@ return array(
// 'Secret key: ' => '',
// 'Test your device' => '',
// 'Assign a color when the task is moved to a specific column' => '',
// '%s via Kanboard' => '',
);

View File

@ -846,4 +846,5 @@ return array(
'Secret key: ' => 'Chave secreta:',
'Test your device' => 'Teste o seu dispositivo',
'Assign a color when the task is moved to a specific column' => 'Atribuir uma cor quando a tarefa é movida em uma coluna específica',
// '%s via Kanboard' => '',
);

View File

@ -846,4 +846,5 @@ return array(
// 'Secret key: ' => '',
// 'Test your device' => '',
// 'Assign a color when the task is moved to a specific column' => '',
// '%s via Kanboard' => '',
);

View File

@ -846,4 +846,5 @@ return array(
// 'Secret key: ' => '',
// 'Test your device' => '',
// 'Assign a color when the task is moved to a specific column' => '',
// '%s via Kanboard' => '',
);

View File

@ -846,4 +846,5 @@ return array(
// 'Secret key: ' => '',
// 'Test your device' => '',
// 'Assign a color when the task is moved to a specific column' => '',
// '%s via Kanboard' => '',
);

View File

@ -846,4 +846,5 @@ return array(
// 'Secret key: ' => '',
// 'Test your device' => '',
// 'Assign a color when the task is moved to a specific column' => '',
// '%s via Kanboard' => '',
);

View File

@ -846,4 +846,5 @@ return array(
// 'Secret key: ' => '',
// 'Test your device' => '',
// 'Assign a color when the task is moved to a specific column' => '',
// '%s via Kanboard' => '',
);

View File

@ -846,4 +846,5 @@ return array(
'Secret key: ' => '密码:',
'Test your device' => '测试设备',
'Assign a color when the task is moved to a specific column' => '任务移动到指定栏目时设置颜色',
// '%s via Kanboard' => '',
);

View File

@ -101,11 +101,18 @@ class Notification extends Base
public function sendEmails($template, array $users, array $data)
{
try {
$author = '';
if (Session::isOpen()) {
$author = e('%s via Kanboard', $this->user->getFullname($this->session['user']));
}
$mailer = Swift_Mailer::newInstance($this->container['mailer']);
$message = Swift_Message::newInstance()
->setSubject($this->getMailSubject($template, $data))
->setFrom(array(MAIL_FROM => 'Kanboard'))
->setFrom(array(MAIL_FROM => $author ?: 'Kanboard'))
->setBody($this->getMailContent($template, $data), 'text/html');
foreach ($users as $user) {