deblan/php-censor
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Improved from email address format for notifications.

Browse source
This commit is contained in:
Dmitry Khomutov 2017-06-21 21:03:57 +07:00
parent ae48f24406
commit 46441106d1
No known key found for this signature in database
GPG key ID: 7EB36C9576F9ECB9
3 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/en/configuring.md
View file

@ -25,7 +25,7 @@ php-censor:
per_page: 10 per_page: 10
url: 'http://php-censor.local' url: 'http://php-censor.local'
email_settings: email_settings:
from_address: 'no-reply@php-censor.local' from_address: 'PHP Censor <no-reply@php-censor.local>'
smtp_address: null smtp_address: null
smtp_port: null smtp_port: null
smtp_username: null smtp_username: null

2
src/PHPCensor/Command/InstallCommand.php
View file

@ -254,7 +254,7 @@ class InstallCommand extends Command
'url' => $url, 'url' => $url,
'queue' => $queueConfig, 'queue' => $queueConfig,
'email_settings' => [ 'email_settings' => [
'from_address' => 'no-reply@php-censor.local', 'from_address' => 'PHP Censor <no-reply@php-censor.local>',
'smtp_address' => null, 'smtp_address' => null,
'smtp_port' => null, 'smtp_port' => null,
'smtp_username' => null, 'smtp_username' => null,

17
src/PHPCensor/Helper/Email.php
View file

@ -95,13 +95,18 @@ class Email
*/ */
protected function getFrom() protected function getFrom()
{ {
$email = $this->config->get('php-censor.email_settings.from_address', self::DEFAULT_FROM); $from = $this->config->get(
'php-censor.email_settings.from_address',
if (empty($email)) { self::DEFAULT_FROM
$email = self::DEFAULT_FROM; );
if (strpos($from, '<') === false) {
return (string)$from;
} }
return $email; preg_match('#^(.*?)<(.*)>$#ui', $from, $fromParts);
return [$fromParts[2] => $fromParts[1]];
} }
/** /**