Display the author in email notifications
This commit is contained in:
@@ -846,4 +846,5 @@ return array(
|
|||||||
// 'Secret key: ' => '',
|
// 'Secret key: ' => '',
|
||||||
// 'Test your device' => '',
|
// 'Test your device' => '',
|
||||||
// 'Assign a color when the task is moved to a specific column' => '',
|
// 'Assign a color when the task is moved to a specific column' => '',
|
||||||
|
// '%s via Kanboard' => '',
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -846,4 +846,5 @@ return array(
|
|||||||
// 'Secret key: ' => '',
|
// 'Secret key: ' => '',
|
||||||
// 'Test your device' => '',
|
// 'Test your device' => '',
|
||||||
// 'Assign a color when the task is moved to a specific column' => '',
|
// 'Assign a color when the task is moved to a specific column' => '',
|
||||||
|
// '%s via Kanboard' => '',
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -846,4 +846,5 @@ return array(
|
|||||||
// 'Secret key: ' => '',
|
// 'Secret key: ' => '',
|
||||||
// 'Test your device' => '',
|
// 'Test your device' => '',
|
||||||
// 'Assign a color when the task is moved to a specific column' => '',
|
// 'Assign a color when the task is moved to a specific column' => '',
|
||||||
|
// '%s via Kanboard' => '',
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -846,4 +846,5 @@ return array(
|
|||||||
// 'Secret key: ' => '',
|
// 'Secret key: ' => '',
|
||||||
// 'Test your device' => '',
|
// 'Test your device' => '',
|
||||||
// 'Assign a color when the task is moved to a specific column' => '',
|
// 'Assign a color when the task is moved to a specific column' => '',
|
||||||
|
// '%s via Kanboard' => '',
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -848,4 +848,5 @@ return array(
|
|||||||
'Secret key: ' => 'Clé secrète : ',
|
'Secret key: ' => 'Clé secrète : ',
|
||||||
'Test your device' => 'Testez votre appareil',
|
'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',
|
'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',
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -846,4 +846,5 @@ return array(
|
|||||||
// 'Secret key: ' => '',
|
// 'Secret key: ' => '',
|
||||||
// 'Test your device' => '',
|
// 'Test your device' => '',
|
||||||
// 'Assign a color when the task is moved to a specific column' => '',
|
// 'Assign a color when the task is moved to a specific column' => '',
|
||||||
|
// '%s via Kanboard' => '',
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -846,4 +846,5 @@ return array(
|
|||||||
// 'Secret key: ' => '',
|
// 'Secret key: ' => '',
|
||||||
// 'Test your device' => '',
|
// 'Test your device' => '',
|
||||||
// 'Assign a color when the task is moved to a specific column' => '',
|
// 'Assign a color when the task is moved to a specific column' => '',
|
||||||
|
// '%s via Kanboard' => '',
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -846,4 +846,5 @@ return array(
|
|||||||
// 'Secret key: ' => '',
|
// 'Secret key: ' => '',
|
||||||
// 'Test your device' => '',
|
// 'Test your device' => '',
|
||||||
// 'Assign a color when the task is moved to a specific column' => '',
|
// 'Assign a color when the task is moved to a specific column' => '',
|
||||||
|
// '%s via Kanboard' => '',
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -846,4 +846,5 @@ return array(
|
|||||||
// 'Secret key: ' => '',
|
// 'Secret key: ' => '',
|
||||||
// 'Test your device' => '',
|
// 'Test your device' => '',
|
||||||
// 'Assign a color when the task is moved to a specific column' => '',
|
// 'Assign a color when the task is moved to a specific column' => '',
|
||||||
|
// '%s via Kanboard' => '',
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -846,4 +846,5 @@ return array(
|
|||||||
// 'Secret key: ' => '',
|
// 'Secret key: ' => '',
|
||||||
// 'Test your device' => '',
|
// 'Test your device' => '',
|
||||||
// 'Assign a color when the task is moved to a specific column' => '',
|
// 'Assign a color when the task is moved to a specific column' => '',
|
||||||
|
// '%s via Kanboard' => '',
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -846,4 +846,5 @@ return array(
|
|||||||
'Secret key: ' => 'Chave secreta:',
|
'Secret key: ' => 'Chave secreta:',
|
||||||
'Test your device' => 'Teste o seu dispositivo',
|
'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',
|
'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' => '',
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -846,4 +846,5 @@ return array(
|
|||||||
// 'Secret key: ' => '',
|
// 'Secret key: ' => '',
|
||||||
// 'Test your device' => '',
|
// 'Test your device' => '',
|
||||||
// 'Assign a color when the task is moved to a specific column' => '',
|
// 'Assign a color when the task is moved to a specific column' => '',
|
||||||
|
// '%s via Kanboard' => '',
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -846,4 +846,5 @@ return array(
|
|||||||
// 'Secret key: ' => '',
|
// 'Secret key: ' => '',
|
||||||
// 'Test your device' => '',
|
// 'Test your device' => '',
|
||||||
// 'Assign a color when the task is moved to a specific column' => '',
|
// 'Assign a color when the task is moved to a specific column' => '',
|
||||||
|
// '%s via Kanboard' => '',
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -846,4 +846,5 @@ return array(
|
|||||||
// 'Secret key: ' => '',
|
// 'Secret key: ' => '',
|
||||||
// 'Test your device' => '',
|
// 'Test your device' => '',
|
||||||
// 'Assign a color when the task is moved to a specific column' => '',
|
// 'Assign a color when the task is moved to a specific column' => '',
|
||||||
|
// '%s via Kanboard' => '',
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -846,4 +846,5 @@ return array(
|
|||||||
// 'Secret key: ' => '',
|
// 'Secret key: ' => '',
|
||||||
// 'Test your device' => '',
|
// 'Test your device' => '',
|
||||||
// 'Assign a color when the task is moved to a specific column' => '',
|
// 'Assign a color when the task is moved to a specific column' => '',
|
||||||
|
// '%s via Kanboard' => '',
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -846,4 +846,5 @@ return array(
|
|||||||
// 'Secret key: ' => '',
|
// 'Secret key: ' => '',
|
||||||
// 'Test your device' => '',
|
// 'Test your device' => '',
|
||||||
// 'Assign a color when the task is moved to a specific column' => '',
|
// 'Assign a color when the task is moved to a specific column' => '',
|
||||||
|
// '%s via Kanboard' => '',
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -846,4 +846,5 @@ return array(
|
|||||||
'Secret key: ' => '密码:',
|
'Secret key: ' => '密码:',
|
||||||
'Test your device' => '测试设备',
|
'Test your device' => '测试设备',
|
||||||
'Assign a color when the task is moved to a specific column' => '任务移动到指定栏目时设置颜色',
|
'Assign a color when the task is moved to a specific column' => '任务移动到指定栏目时设置颜色',
|
||||||
|
// '%s via Kanboard' => '',
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -101,11 +101,18 @@ class Notification extends Base
|
|||||||
public function sendEmails($template, array $users, array $data)
|
public function sendEmails($template, array $users, array $data)
|
||||||
{
|
{
|
||||||
try {
|
try {
|
||||||
|
|
||||||
|
$author = '';
|
||||||
|
|
||||||
|
if (Session::isOpen()) {
|
||||||
|
$author = e('%s via Kanboard', $this->user->getFullname($this->session['user']));
|
||||||
|
}
|
||||||
|
|
||||||
$mailer = Swift_Mailer::newInstance($this->container['mailer']);
|
$mailer = Swift_Mailer::newInstance($this->container['mailer']);
|
||||||
|
|
||||||
$message = Swift_Message::newInstance()
|
$message = Swift_Message::newInstance()
|
||||||
->setSubject($this->getMailSubject($template, $data))
|
->setSubject($this->getMailSubject($template, $data))
|
||||||
->setFrom(array(MAIL_FROM => 'Kanboard'))
|
->setFrom(array(MAIL_FROM => $author ?: 'Kanboard'))
|
||||||
->setBody($this->getMailContent($template, $data), 'text/html');
|
->setBody($this->getMailContent($template, $data), 'text/html');
|
||||||
|
|
||||||
foreach ($users as $user) {
|
foreach ($users as $user) {
|
||||||
|
|||||||
Reference in New Issue
Block a user