@@ -620,7 +620,7 @@ discard block |
||
| 620 | 620 | public function getAltBody() |
| 621 | 621 | {
|
| 622 | 622 | if (is_html($this->body)) {
|
| 623 | - $body = preg_match('/\<body.*?\>(.*)\<\/body\>/si', $this->body, $match) ? $match[ 1 ] : $this->body;
|
|
| 623 | + $body = preg_match('/\<body.*?\>(.*)\<\/body\>/si', $this->body, $match) ? $match[1] : $this->body;
|
|
| 624 | 624 | $body = str_replace("\t", '', preg_replace('#<!--(.*)--\>#', '', trim(strip_tags($body))));
|
| 625 | 625 | |
| 626 | 626 | for ($i = 20; $i >= 3; $i--) {
|
@@ -656,7 +656,7 @@ discard block |
||
| 656 | 656 | ]; |
| 657 | 657 | |
| 658 | 658 | if (array_key_exists($priority, $priorities)) {
|
| 659 | - $this->priority = $priorities[ $priority ]; |
|
| 659 | + $this->priority = $priorities[$priority]; |
|
| 660 | 660 | } |
| 661 | 661 | } |
| 662 | 662 | |
@@ -692,7 +692,7 @@ discard block |
||
| 692 | 692 | */ |
| 693 | 693 | public function addHeader($name, $value) |
| 694 | 694 | {
|
| 695 | - $this->headers[ $name ] = $value; |
|
| 695 | + $this->headers[$name] = $value; |
|
| 696 | 696 | |
| 697 | 697 | return $this; |
| 698 | 698 | } |
@@ -833,7 +833,7 @@ discard block |
||
| 833 | 833 | */ |
| 834 | 834 | public function bcc($email, $name = null, $limit = 100) |
| 835 | 835 | {
|
| 836 | - $this->batchLimit = (int)$limit; |
|
| 836 | + $this->batchLimit = (int) $limit; |
|
| 837 | 837 | $this->addAddress($email, $name, 'bcc'); |
| 838 | 838 | |
| 839 | 839 | return $this; |
@@ -869,7 +869,7 @@ discard block |
||
| 869 | 869 | */ |
| 870 | 870 | public function subscribers($email, $limit = 100) |
| 871 | 871 | {
|
| 872 | - $this->batchLimit = (int)$limit; |
|
| 872 | + $this->batchLimit = (int) $limit; |
|
| 873 | 873 | $this->addAddress($email, null, 'subscribers'); |
| 874 | 874 | |
| 875 | 875 | return $this; |
@@ -911,7 +911,7 @@ discard block |
||
| 911 | 911 | $filename = isset($filename) ? $filename : pathinfo($attachment, PATHINFO_BASENAME); |
| 912 | 912 | |
| 913 | 913 | if ( ! in_array($attachment, $this->attachments)) {
|
| 914 | - $this->attachments[ $filename ] = $attachment; |
|
| 914 | + $this->attachments[$filename] = $attachment; |
|
| 915 | 915 | } |
| 916 | 916 | } |
| 917 | 917 | |
@@ -111,8 +111,8 @@ |
||
| 111 | 111 | $email = trim($email); |
| 112 | 112 | |
| 113 | 113 | if (preg_match('/\<(.*)\>/', $email, $matches)) {
|
| 114 | - $email = trim(str_replace($matches[ 0 ], '', $email)); |
|
| 115 | - $name = $matches[ 1 ]; |
|
| 114 | + $email = trim(str_replace($matches[0], '', $email)); |
|
| 115 | + $name = $matches[1]; |
|
| 116 | 116 | } |
| 117 | 117 | |
| 118 | 118 | if (filter_var($email, FILTER_VALIDATE_EMAIL)) {
|
@@ -55,13 +55,13 @@ discard block |
||
| 55 | 55 | * `3` As 2 plus connection status |
| 56 | 56 | * `4` Low-level data output. |
| 57 | 57 | */ |
| 58 | - $this->config[ 'debug' ] = 0; |
|
| 58 | + $this->config['debug'] = 0; |
|
| 59 | 59 | } |
| 60 | 60 | |
| 61 | 61 | if ( ! $this->config->offsetExists('auth')) {
|
| 62 | - $this->config[ 'auth' ] = false; |
|
| 63 | - if ( ! empty($this->config[ 'username' ])) {
|
|
| 64 | - $this->config[ 'auth' ] = true; |
|
| 62 | + $this->config['auth'] = false; |
|
| 63 | + if ( ! empty($this->config['username'])) {
|
|
| 64 | + $this->config['auth'] = true; |
|
| 65 | 65 | } |
| 66 | 66 | } |
| 67 | 67 | } |
@@ -81,20 +81,20 @@ discard block |
||
| 81 | 81 | {
|
| 82 | 82 | $phpMailer = new PHPMailer(); |
| 83 | 83 | $phpMailer->isSMTP(); |
| 84 | - $phpMailer->SMTPDebug = $this->config[ 'debug' ]; |
|
| 84 | + $phpMailer->SMTPDebug = $this->config['debug']; |
|
| 85 | 85 | |
| 86 | - $host = $this->config[ 'host' ]; |
|
| 86 | + $host = $this->config['host']; |
|
| 87 | 87 | |
| 88 | - if (is_array($this->config[ 'host' ])) {
|
|
| 89 | - $host = implode(';', $this->config[ 'host' ]);
|
|
| 88 | + if (is_array($this->config['host'])) {
|
|
| 89 | + $host = implode(';', $this->config['host']);
|
|
| 90 | 90 | } |
| 91 | 91 | |
| 92 | 92 | $phpMailer->Host = $host; |
| 93 | - $phpMailer->SMTPAuth = $this->config[ 'auth' ]; |
|
| 94 | - $phpMailer->Username = $this->config[ 'username' ]; |
|
| 95 | - $phpMailer->Password = $this->config[ 'password' ]; |
|
| 96 | - $phpMailer->SMTPSecure = $this->config[ 'encryption' ]; |
|
| 97 | - $phpMailer->Port = $this->config[ 'port' ]; |
|
| 93 | + $phpMailer->SMTPAuth = $this->config['auth']; |
|
| 94 | + $phpMailer->Username = $this->config['username']; |
|
| 95 | + $phpMailer->Password = $this->config['password']; |
|
| 96 | + $phpMailer->SMTPSecure = $this->config['encryption']; |
|
| 97 | + $phpMailer->Port = $this->config['port']; |
|
| 98 | 98 | |
| 99 | 99 | // Set from |
| 100 | 100 | if (false !== ($from = $message->getFrom())) {
|
@@ -16,7 +16,7 @@ |
||
| 16 | 16 | * @param $className |
| 17 | 17 | */ |
| 18 | 18 | spl_autoload_register( |
| 19 | - function ($className) {
|
|
| 19 | + function($className) {
|
|
| 20 | 20 | if (strpos($className, 'O2System\Email\\') === false) {
|
| 21 | 21 | return; |
| 22 | 22 | } |
@@ -35,8 +35,8 @@ discard block |
||
| 35 | 35 | 'wordwrap' => false, |
| 36 | 36 | ]; |
| 37 | 37 | |
| 38 | - if (isset($config[ 'protocol' ])) {
|
|
| 39 | - switch ($config[ 'protocol' ]) {
|
|
| 38 | + if (isset($config['protocol'])) {
|
|
| 39 | + switch ($config['protocol']) {
|
|
| 40 | 40 | default: |
| 41 | 41 | case 'mail': |
| 42 | 42 | |
@@ -45,26 +45,26 @@ discard block |
||
| 45 | 45 | case 'sendmail': |
| 46 | 46 | |
| 47 | 47 | // Path to sendmail binary |
| 48 | - $defaultConfig[ 'mailPath' ] = '/usr/sbin/sendmail'; |
|
| 48 | + $defaultConfig['mailPath'] = '/usr/sbin/sendmail'; |
|
| 49 | 49 | |
| 50 | 50 | break; |
| 51 | 51 | |
| 52 | 52 | case 'smtp': |
| 53 | 53 | |
| 54 | 54 | // SMTP Host can be an IP Address or domain name |
| 55 | - $defaultConfig[ 'host' ] = ''; |
|
| 55 | + $defaultConfig['host'] = ''; |
|
| 56 | 56 | |
| 57 | 57 | // SMTP Port by default it's set to 25 |
| 58 | - $defaultConfig[ 'port' ] = 25; |
|
| 58 | + $defaultConfig['port'] = 25; |
|
| 59 | 59 | |
| 60 | 60 | // SMTP Username |
| 61 | - $defaultConfig[ 'user' ] = ''; |
|
| 61 | + $defaultConfig['user'] = ''; |
|
| 62 | 62 | |
| 63 | 63 | // SMTP Password |
| 64 | - $defaultConfig[ 'pass' ] = ''; |
|
| 64 | + $defaultConfig['pass'] = ''; |
|
| 65 | 65 | |
| 66 | 66 | // SMTP Encryption empty, tls or ssl |
| 67 | - $defaultConfig[ 'encryption' ] = ''; |
|
| 67 | + $defaultConfig['encryption'] = ''; |
|
| 68 | 68 | |
| 69 | 69 | break; |
| 70 | 70 | } |