tnhfw / tnh-fw

core/libraries/Email.php

Indentation +25 added lines, -25 removed lines

@@ -385,7 +385,7 @@ 
             }
             $filename = $this->encodeUtf8($this->filterOther((string) $filename));
             if (empty($data)) {
-               $data = $this->getAttachmentData($path);
+                $data = $this->getAttachmentData($path);
             }
             $this->attachments[] = array(
                 'path' => $path,
@@ -426,7 +426,7 @@ 
             $addresses = array();
             foreach ($pairs as $name => $email) {
                 if (is_numeric($name)) {
-                   $name = null;
+                    $name = null;
                 }
                 $addresses[] = $this->formatHeader($email, $name);
             }
@@ -970,10 +970,10 @@ 
             return $headers;
         }
 
-         /**
-         * Get the attachment message for send or the simple message
-         * @return string
-         */
+            /**
+             * Get the attachment message for send or the simple message
+             * @return string
+             */
         protected function getMessageWithAttachmentForSend() {
             $message = $this->getWrapMessage();
             if ($this->hasAttachments()) {
@@ -1010,11 +1010,11 @@ 
          */
         protected function sendHelloCommand() {
             $responseCode = $this->sendCommand('EHLO ' . $this->getSmtpClientHostname())
-                                 ->getSmtpResponseCode();
+                                    ->getSmtpResponseCode();
             if ($responseCode !== 250) {
                 //May be try with "HELO"
                 $responseCode = $this->sendCommand('HELO ' . $this->getSmtpClientHostname())
-                                     ->getSmtpResponseCode();
+                                        ->getSmtpResponseCode();
                 if ($responseCode !== 250) {
                     $this->error = $this->smtpResponse;
                     return false;
@@ -1158,7 +1158,7 @@ 
             $message = $this->getMessageWithAttachmentForSend();
             $headers = $this->getHeadersForSend(); 
             $this->logger->info('Sending new mail using mail protocol, the information are listed below: '
-                                  . 'destination: ' . $to . ', headers: ' . $headers . ', message: ' . $message);
+                                    . 'destination: ' . $to . ', headers: ' . $headers . ', message: ' . $message);
             $result = mail($to, $this->subject, $message, $headers, $this->params);
             if (!$result) {
                 $this->error = 'Error when sending mail using mail protocol';
@@ -1166,10 +1166,10 @@ 
             return $result;
         }
 
-         /**
-         * Send mail using "smtp" protocol
-         * @return boolean
-         */
+            /**
+             * Send mail using "smtp" protocol
+             * @return boolean
+             */
         protected function sendSmtp() {
             if (!$this->smtpConnection()) {
                 return false;
@@ -1189,7 +1189,7 @@ 
             $message = $this->getMessageWithAttachmentForSend();
             $headers = $this->getHeadersForSend();
             $this->logger->info('Sending new mail using SMTP protocol, the information are listed below: '
-                                  . 'destination: ' . $to . ', headers: ' . $headers . ', message: ' . $message);
+                                    . 'destination: ' . $to . ', headers: ' . $headers . ', message: ' . $message);
             
             $recipients = array_merge($this->to, $this->cc, $this->bcc);
             $commands = array(
@@ -1223,17 +1223,17 @@ 
             return empty($this->error);
         }
 
-         /**
-         * Return the client hostname for SMTP
-         * 
-         * There are only two legal types of hostname - either a fully
-         * qualified domain name (eg: "mail.example.com") or an IP literal
-         * (eg: "[1.2.3.4]").
-         *
-         * @link    https://tools.ietf.org/html/rfc5321#section-2.3.5
-         * @link    http://cbl.abuseat.org/namingproblems.html
-         * @return string
-         */
+            /**
+             * Return the client hostname for SMTP
+             * 
+             * There are only two legal types of hostname - either a fully
+             * qualified domain name (eg: "mail.example.com") or an IP literal
+             * (eg: "[1.2.3.4]").
+             *
+             * @link    https://tools.ietf.org/html/rfc5321#section-2.3.5
+             * @link    http://cbl.abuseat.org/namingproblems.html
+             * @return string
+             */
         protected function getSmtpClientHostname() {
             $globals = &class_loader('GlobalVar', 'classes');
             if ($globals->server('SERVER_NAME')) {

Spacing +5 added lines, -5 removed lines

@@ -28,7 +28,7 @@ 
      * SOFTWARE.
      */
 
-    class Email extends BaseClass{
+    class Email extends BaseClass {
         /**
          * @var int $wrap
          */
@@ -978,7 +978,7 @@ 
             $message = $this->getWrapMessage();
             if ($this->hasAttachments()) {
                 $this->setAttachmentHeaders();
-                $message  = $this->assembleAttachmentBody();
+                $message = $this->assembleAttachmentBody();
             }
             return $message;
         }
@@ -1068,7 +1068,7 @@ 
                                         $this->smtpConnectionTimeout
                                     );
 
-            if (! is_resource($this->smtpSocket)) {
+            if (!is_resource($this->smtpSocket)) {
                 $this->error = $errorNumber . ':' . $errorMessage;
                 return false;
             }
@@ -1116,7 +1116,7 @@ 
                      * We want the negotiation, so we'll force it below ...
                      */
                     $method = STREAM_CRYPTO_METHOD_TLS_CLIENT;
-                    if(version_compare(PHP_VERSION, '5.6', '>=')) {
+                    if (version_compare(PHP_VERSION, '5.6', '>=')) {
                         $method = STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT | STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT | STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT;
                     }
                     stream_socket_enable_crypto($this->smtpSocket, true, $method);
@@ -1182,7 +1182,7 @@ 
                 'To' => $to
             );
             foreach ($additionalHeaders as $key => $value) {
-                if (! isset($this->headers[$key])) {
+                if (!isset($this->headers[$key])) {
                     $this->headers[$key] = $value;
                 }
             }