diff options
Diffstat (limited to 'app/Helper/MailHelper.php')
| -rw-r--r-- | app/Helper/MailHelper.php | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/app/Helper/MailHelper.php b/app/Helper/MailHelper.php index 3b1c9e41..cb16d6f8 100644 --- a/app/Helper/MailHelper.php +++ b/app/Helper/MailHelper.php @@ -40,8 +40,9 @@ class MailHelper extends Base */ public function filterSubject($subject) { - $subject = str_replace('RE: ', '', $subject); - $subject = str_replace('FW: ', '', $subject); + $subject = str_ireplace('RE: ', '', $subject); + $subject = str_ireplace('FW: ', '', $subject); + $subject = str_ireplace('Fwd: ', '', $subject); return $subject; } @@ -54,27 +55,31 @@ class MailHelper extends Base */ public function getMailSenderAddress() { - $email = $this->configModel->get('mail_sender_address'); + if (MAIL_CONFIGURATION) { + $email = $this->configModel->get('mail_sender_address'); - if (!empty($email)) { - return $email; + if (! empty($email)) { + return $email; + } } return MAIL_FROM; } /** - * Get mail sender address + * Get mail transport * * @access public * @return string */ public function getMailTransport() { - $transport = $this->configModel->get('mail_transport'); + if (MAIL_CONFIGURATION) { + $transport = $this->configModel->get('mail_transport'); - if (!empty($transport)) { - return $transport; + if (! empty($transport)) { + return $transport; + } } return MAIL_TRANSPORT; |