Expose to the user interface the email sender address

This commit is contained in:
Frederic Guillot 2016-06-02 20:58:34 -04:00
parent 523e0aad7e
commit a27057dd6f
4 changed files with 32 additions and 1 deletions

View File

@ -32,7 +32,7 @@ class Mail extends Base implements ClientInterface
try {
$message = Swift_Message::newInstance()
->setSubject($subject)
->setFrom(array(MAIL_FROM => $author))
->setFrom(array($this->helper->mail->getMailSenderAddress() => $author))
->setBody($html, 'text/html')
->setTo(array($email => $name));

View File

@ -45,4 +45,21 @@ class MailHelper extends Base
return $subject;
}
/**
* Get mail sender address
*
* @access public
* @return string
*/
public function getMailSenderAddress()
{
$email = $this->configModel->get('mail_sender_address');
if (!empty($email)) {
return $email;
}
return MAIL_FROM;
}
}

View File

@ -9,6 +9,9 @@
<?= $this->form->text('application_url', $values, $errors, array('placeholder="http://example.kanboard.net/"')) ?>
<p class="form-help"><?= t('Example: http://example.kanboard.net/ (used to generate absolute URLs)') ?></p>
<?= $this->form->label(t('Email sender address'), 'mail_sender_address') ?>
<?= $this->form->text('mail_sender_address', $values, $errors, array('placeholder="'.MAIL_FROM.'"')) ?>
<?= $this->form->label(t('Language'), 'application_language') ?>
<?= $this->form->select('application_language', $languages, $values, $errors) ?>

View File

@ -21,4 +21,15 @@ class MailHelperTest extends Base
$this->assertEquals('Test', $helper->filterSubject('RE: Test'));
$this->assertEquals('Test', $helper->filterSubject('FW: Test'));
}
public function testGetSenderAddress()
{
$helper = new MailHelper($this->container);
$this->assertEquals('notifications@kanboard.local', $helper->getMailSenderAddress());
$this->container['configModel']->save(array('mail_sender_address' => 'me@here'));
$this->container['memoryCache']->flush();
$this->assertEquals('me@here', $helper->getMailSenderAddress());
}
}