fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-22 05:15:29 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix error in Woorimail driver when the recipient's name is empty

Browse source
This commit is contained in:
Kijin Sung 2016-06-15 16:48:16 +09:00
parent 0d9e6f333f
commit 7484b67b3a
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
common/framework/drivers/mail/woorimail.php
View file

@ -118,7 +118,7 @@ class Woorimail extends Base implements \Rhymix\Framework\Drivers\MailInterface
foreach($from as $email => $name) foreach($from as $email => $name)
{ {
$data['sender_email'] = $email; $data['sender_email'] = $email;
$data['sender_nickname'] = $name; $data['sender_nickname'] = trim($name) ?: substr($email, 0, strpos($email, '@'));
break; break;
} }
if(isset($this->_config['api_type']) && $this->_config['api_type'] === 'paid') if(isset($this->_config['api_type']) && $this->_config['api_type'] === 'paid')
@ -137,7 +137,7 @@ class Woorimail extends Base implements \Rhymix\Framework\Drivers\MailInterface
foreach($to as $email => $name) foreach($to as $email => $name)
{ {
$data['receiver_email'][] = $email; $data['receiver_email'][] = $email;
$data['receiver_nickname'][] = str_replace(',', '', $name); $data['receiver_nickname'][] = str_replace(',', '', trim($name) ?: substr($email, 0, strpos($email, '@')));
} }
} }
if ($cc = $message->message->getCc()) if ($cc = $message->message->getCc())
@ -145,7 +145,7 @@ class Woorimail extends Base implements \Rhymix\Framework\Drivers\MailInterface
foreach($cc as $email => $name) foreach($cc as $email => $name)
{ {
$data['receiver_email'][] = $email; $data['receiver_email'][] = $email;
$data['receiver_nickname'][] = str_replace(',', '', $name); $data['receiver_nickname'][] = str_replace(',', '', trim($name) ?: substr($email, 0, strpos($email, '@')));
} }
} }
if ($bcc = $message->message->getBcc()) if ($bcc = $message->message->getBcc())
@ -153,7 +153,7 @@ class Woorimail extends Base implements \Rhymix\Framework\Drivers\MailInterface
foreach($bcc as $email => $name) foreach($bcc as $email => $name)
{ {
$data['receiver_email'][] = $email; $data['receiver_email'][] = $email;
$data['receiver_nickname'][] = str_replace(',', '', $name); $data['receiver_nickname'][] = str_replace(',', '', trim($name) ?: substr($email, 0, strpos($email, '@')));
} }
} }
$data['receiver_email'] = implode(',', $data['receiver_email']); $data['receiver_email'] = implode(',', $data['receiver_email']);