@@ -395,7 +395,7 @@ discard block |
||
| 395 | 395 | $addresses = array(); |
| 396 | 396 | foreach ($pairs as $name => $email) { |
| 397 | 397 | if (is_numeric($name)) { |
| 398 | - $name = null; |
|
| 398 | + $name = null; |
|
| 399 | 399 | } |
| 400 | 400 | $addresses[] = $this->formatHeader($email, $name); |
| 401 | 401 | } |
@@ -837,10 +837,10 @@ discard block |
||
| 837 | 837 | return $headers; |
| 838 | 838 | } |
| 839 | 839 | |
| 840 | - /** |
|
| 841 | - * Get the attachment message for send or the simple message |
|
| 842 | - * @return string |
|
| 843 | - */ |
|
| 840 | + /** |
|
| 841 | + * Get the attachment message for send or the simple message |
|
| 842 | + * @return string |
|
| 843 | + */ |
|
| 844 | 844 | protected function getMessageWithAttachmentForSend() { |
| 845 | 845 | $message = $this->getWrapMessage(); |
| 846 | 846 | if ($this->hasAttachments()) { |
@@ -870,7 +870,7 @@ discard block |
||
| 870 | 870 | */ |
| 871 | 871 | protected function sendHelloCommand() { |
| 872 | 872 | $responseCode = $this->sendCommand('EHLO ' . $this->getSmtpClientHostname()) |
| 873 | - ->getSmtpResponseCode(); |
|
| 873 | + ->getSmtpResponseCode(); |
|
| 874 | 874 | if ($responseCode !== 250) { |
| 875 | 875 | $this->error = $this->smtpResponse; |
| 876 | 876 | return false; |
@@ -1017,7 +1017,7 @@ discard block |
||
| 1017 | 1017 | $message = $this->getMessageWithAttachmentForSend(); |
| 1018 | 1018 | $headers = $this->getHeadersForSend(); |
| 1019 | 1019 | $this->logger->info('Sending new mail using mail protocol, the information are listed below: ' |
| 1020 | - . 'destination: ' . $to . ', headers: ' . $headers . ', message: ' . $message); |
|
| 1020 | + . 'destination: ' . $to . ', headers: ' . $headers . ', message: ' . $message); |
|
| 1021 | 1021 | $result = mail($to, $this->subject, $message, $headers, $this->params); |
| 1022 | 1022 | if (!$result) { |
| 1023 | 1023 | $this->error = 'Error when sending mail using mail protocol'; |
@@ -1025,10 +1025,10 @@ discard block |
||
| 1025 | 1025 | return $result; |
| 1026 | 1026 | } |
| 1027 | 1027 | |
| 1028 | - /** |
|
| 1029 | - * Send mail using "smtp" protocol |
|
| 1030 | - * @return boolean |
|
| 1031 | - */ |
|
| 1028 | + /** |
|
| 1029 | + * Send mail using "smtp" protocol |
|
| 1030 | + * @return boolean |
|
| 1031 | + */ |
|
| 1032 | 1032 | protected function sendSmtp() { |
| 1033 | 1033 | if (!$this->smtpConnection()) { |
| 1034 | 1034 | return false; |
@@ -1038,7 +1038,7 @@ discard block |
||
| 1038 | 1038 | $message = $this->getMessageWithAttachmentForSend(); |
| 1039 | 1039 | $headers = $this->getHeadersForSend(); |
| 1040 | 1040 | $this->logger->info('Sending new mail using SMTP protocol, the information are listed below: ' |
| 1041 | - . 'destination: ' . $to . ', headers: ' . $headers . ', message: ' . $message); |
|
| 1041 | + . 'destination: ' . $to . ', headers: ' . $headers . ', message: ' . $message); |
|
| 1042 | 1042 | $recipients = array_merge($this->to, $this->cc, $this->bcc); |
| 1043 | 1043 | $commands = array( |
| 1044 | 1044 | 'mail_from' => array('MAIL FROM: <' . $this->from . '>', 'MAIL_FROM', 250), |
@@ -1089,17 +1089,17 @@ discard block |
||
| 1089 | 1089 | } |
| 1090 | 1090 | |
| 1091 | 1091 | |
| 1092 | - /** |
|
| 1093 | - * Return the client hostname for SMTP |
|
| 1094 | - * |
|
| 1095 | - * There are only two legal types of hostname - either a fully |
|
| 1096 | - * qualified domain name (eg: "mail.example.com") or an IP literal |
|
| 1097 | - * (eg: "[1.2.3.4]"). |
|
| 1098 | - * |
|
| 1099 | - * @link https://tools.ietf.org/html/rfc5321#section-2.3.5 |
|
| 1100 | - * @link http://cbl.abuseat.org/namingproblems.html |
|
| 1101 | - * @return string |
|
| 1102 | - */ |
|
| 1092 | + /** |
|
| 1093 | + * Return the client hostname for SMTP |
|
| 1094 | + * |
|
| 1095 | + * There are only two legal types of hostname - either a fully |
|
| 1096 | + * qualified domain name (eg: "mail.example.com") or an IP literal |
|
| 1097 | + * (eg: "[1.2.3.4]"). |
|
| 1098 | + * |
|
| 1099 | + * @link https://tools.ietf.org/html/rfc5321#section-2.3.5 |
|
| 1100 | + * @link http://cbl.abuseat.org/namingproblems.html |
|
| 1101 | + * @return string |
|
| 1102 | + */ |
|
| 1103 | 1103 | protected function getSmtpClientHostname() { |
| 1104 | 1104 | $globals = &class_loader('GlobalVar', 'classes'); |
| 1105 | 1105 | if ($globals->server('SERVER_NAME')) { |
@@ -79,7 +79,7 @@ |
||
| 79 | 79 | if ($cookieLang && $this->isValid($cookieLang)) { |
| 80 | 80 | $this->current = $cookieLang; |
| 81 | 81 | $this->logger->info('Language from cookie [' . $cfgKey . '] is valid so ' |
| 82 | - .'we will set the language using the cookie value [' . $cookieLang . ']'); |
|
| 82 | + .'we will set the language using the cookie value [' . $cookieLang . ']'); |
|
| 83 | 83 | } else { |
| 84 | 84 | $this->logger->info('Language from cookie [' . $cfgKey . '] is not set, use the default value [' . $this->getDefault() . ']'); |
| 85 | 85 | $this->current = $this->getDefault(); |