@@ -45,15 +45,15 @@ discard block |
||
45 | 45 | */ |
46 | 46 | public static function send(Tree $tree, $to_email, $to_name, $replyto_email, $replyto_name, $subject, $message) { |
47 | 47 | try { |
48 | - $mail = Swift_Message::newInstance() |
|
49 | - ->setSubject($subject) |
|
50 | - ->setFrom(Site::getPreference('SMTP_FROM_NAME'), $tree->getPreference('title')) |
|
51 | - ->setTo($to_email, $to_name) |
|
52 | - ->setReplyTo($replyto_email, $replyto_name) |
|
53 | - ->setBody($message, 'text/html') |
|
54 | - ->addPart(Filter::unescapeHtml($message), 'text/plain'); |
|
48 | + $mail = Swift_Message::newInstance() |
|
49 | + ->setSubject($subject) |
|
50 | + ->setFrom(Site::getPreference('SMTP_FROM_NAME'), $tree->getPreference('title')) |
|
51 | + ->setTo($to_email, $to_name) |
|
52 | + ->setReplyTo($replyto_email, $replyto_name) |
|
53 | + ->setBody($message, 'text/html') |
|
54 | + ->addPart(Filter::unescapeHtml($message), 'text/plain'); |
|
55 | 55 | |
56 | - Swift_Mailer::newInstance(self::transport())->send($mail); |
|
56 | + Swift_Mailer::newInstance(self::transport())->send($mail); |
|
57 | 57 | } catch (Exception $ex) { |
58 | 58 | Log::addErrorLog('Mail: ' . $ex->getMessage()); |
59 | 59 | |
@@ -93,20 +93,20 @@ discard block |
||
93 | 93 | case 'internal': |
94 | 94 | return Swift_MailTransport::newInstance(); |
95 | 95 | case 'external': |
96 | - $transport = Swift_SmtpTransport::newInstance() |
|
97 | - ->setHost(Site::getPreference('SMTP_HOST')) |
|
98 | - ->setPort(Site::getPreference('SMTP_PORT')) |
|
99 | - ->setLocalDomain(Site::getPreference('SMTP_HELO')); |
|
96 | + $transport = Swift_SmtpTransport::newInstance() |
|
97 | + ->setHost(Site::getPreference('SMTP_HOST')) |
|
98 | + ->setPort(Site::getPreference('SMTP_PORT')) |
|
99 | + ->setLocalDomain(Site::getPreference('SMTP_HELO')); |
|
100 | 100 | |
101 | - if (Site::getPreference('SMTP_AUTH')) { |
|
102 | - $transport |
|
103 | - ->setUsername(Site::getPreference('SMTP_AUTH_USER')) |
|
104 | - ->setPassword(Site::getPreference('SMTP_AUTH_PASS')); |
|
105 | - } |
|
101 | + if (Site::getPreference('SMTP_AUTH')) { |
|
102 | + $transport |
|
103 | + ->setUsername(Site::getPreference('SMTP_AUTH_USER')) |
|
104 | + ->setPassword(Site::getPreference('SMTP_AUTH_PASS')); |
|
105 | + } |
|
106 | 106 | |
107 | - if (Site::getPreference('SMTP_SSL') !== 'none') { |
|
108 | - $transport->setEncryption(Site::getPreference('SMTP_SSL')); |
|
109 | - } |
|
107 | + if (Site::getPreference('SMTP_SSL') !== 'none') { |
|
108 | + $transport->setEncryption(Site::getPreference('SMTP_SSL')); |
|
109 | + } |
|
110 | 110 | |
111 | 111 | return $transport; |
112 | 112 | default: |
@@ -64,7 +64,7 @@ |
||
64 | 64 | |
65 | 65 | return [ |
66 | 66 | 'data-language' => json_encode($language), |
67 | - 'data-length-menu' => json_encode([array_keys($length_menu), array_values($length_menu)]) |
|
67 | + 'data-length-menu' => json_encode([array_keys($length_menu), array_values($length_menu)]) |
|
68 | 68 | ]; |
69 | 69 | } |
70 | 70 |
@@ -90,9 +90,9 @@ |
||
90 | 90 | 'info' => 'fa fa-info-circle', |
91 | 91 | 'warning' => 'fa fa-exclamation-circle', |
92 | 92 | |
93 | - // Icons for file types |
|
94 | - 'mime-application-pdf' => '', |
|
95 | - 'mime-text-html' => '', |
|
93 | + // Icons for file types |
|
94 | + 'mime-application-pdf' => '', |
|
95 | + 'mime-text-html' => '', |
|
96 | 96 | |
97 | 97 | // Other icons |
98 | 98 | 'mail' => 'fa fa-envelope-o', |