majiameng / phpMailer

src/Gateways/Smtp.php

Spacing +29 added lines, -29 removed lines

@@ -7,7 +7,7 @@ 
 namespace tinymeng\mailer\Gateways;
 use tinymeng\mailer\Connector\Gateway;
 
-class Smtp extends Gateway{
+class Smtp extends Gateway {
 
     /**
      * @var
@@ -30,8 +30,8 @@ 
     {
         $mail_from = $this->getAddress($this->stripComment($this->from_address));
         $body = preg_replace("/(^|(\r\n))(\.)/", "\1.\3", $body);
-        $this->boundary = "====" . md5(uniqid()) . "====";
-        $body = $this->prepareBody($body,$mailType);
+        $this->boundary = "====".md5(uniqid())."====";
+        $body = $this->prepareBody($body, $mailType);
         $header = $this->buildHeaders($subject, $mailType, $mail_from);
 
         // Prepare recipient list
@@ -41,14 +41,14 @@ 
         foreach ($TO as $rcpt_to) {
             $rcpt_to = $this->getAddress($rcpt_to);
             if (!$this->smtpSockopen($rcpt_to)) {
-                $this->logWrite("Error: Cannot send email to " . $rcpt_to . "\n");
+                $this->logWrite("Error: Cannot send email to ".$rcpt_to."\n");
                 $sent = false;
                 continue;
             }
             if ($this->smtpSend($this->host_name, $mail_from, $rcpt_to, $header, $body)) {
-                $this->logWrite("E-mail has been sent to <" . $rcpt_to . ">\n");
+                $this->logWrite("E-mail has been sent to <".$rcpt_to.">\n");
             } else {
-                $this->logWrite("Error: Cannot send email to <" . $rcpt_to . ">\n");
+                $this->logWrite("Error: Cannot send email to <".$rcpt_to.">\n");
                 $sent = false;
             }
             fclose($this->sock);
@@ -64,7 +64,7 @@ 
      * @return string
      * @author Tinymeng <666@majiameng.com>
      */
-    private function buildHeaders($subject, $mailType, $mail_from){
+    private function buildHeaders($subject, $mailType, $mail_from) {
         // Set headers
         $header = "MIME-Version: 1.0\r\n";
         if (strtoupper($mailType) == "HTML") {
@@ -72,20 +72,20 @@ 
         } else {
             $header .= "Content-Type: text/plain; charset=UTF-8\r\n";
         }
-        $header .= "To: " . $this->to_address . "\r\n";
+        $header .= "To: ".$this->to_address."\r\n";
         if (!empty($this->cc_address)) {
-            $header .= "Cc: " . $this->cc_address . "\r\n";
+            $header .= "Cc: ".$this->cc_address."\r\n";
         }
-        $header .= "From: $this->from_address <" . $this->from_address . ">\r\n";
-        $header .= "Subject: " . $subject . "\r\n";
-        if(!empty($this->headers)){
-            foreach ($this->headers as $head){
+        $header .= "From: $this->from_address <".$this->from_address.">\r\n";
+        $header .= "Subject: ".$subject."\r\n";
+        if (!empty($this->headers)) {
+            foreach ($this->headers as $head) {
                 $header .= $head;
             }
         }
-        $header .= "Date: " . date("r") . "\r\n";
-        $header .= "X-Mailer: By Redhat (PHP/" . phpversion() . ")\r\n";
-        $header .= "Message-ID: <" . date("YmdHis") . "." . uniqid() . "@" . $mail_from . ">\r\n";
+        $header .= "Date: ".date("r")."\r\n";
+        $header .= "X-Mailer: By Redhat (PHP/".phpversion().")\r\n";
+        $header .= "Message-ID: <".date("YmdHis").".".uniqid()."@".$mail_from.">\r\n";
         return $header;
     }
 
@@ -96,23 +96,23 @@ 
      * @return string
      * @author Tinymeng <666@majiameng.com>
      */
-    private function prepareBody($body, $mailType){
+    private function prepareBody($body, $mailType) {
         if (strtoupper($mailType) == "HTML") {
             // Body with text and attachments
-            $body = "--$this->boundary\r\n" .
-                "Content-Type: text/html; charset=UTF-8\r\n" .
-                "Content-Transfer-Encoding: 7bit\r\n\r\n" .
-                $body . "\r\n";
+            $body = "--$this->boundary\r\n".
+                "Content-Type: text/html; charset=UTF-8\r\n".
+                "Content-Transfer-Encoding: 7bit\r\n\r\n".
+                $body."\r\n";
 
-            if(!empty($this->attachments)){
+            if (!empty($this->attachments)) {
                 foreach ($this->attachments as $attachment) {
                     $fileName = basename($attachment);
                     $fileContent = chunk_split(base64_encode(file_get_contents($attachment)));
-                    $body .= "--$this->boundary\r\n" .
-                        "Content-Type: application/octet-stream; name=\"$fileName\"\r\n" .
-                        "Content-Transfer-Encoding: base64\r\n" .
-                        "Content-Disposition: attachment; filename=\"$fileName\"\r\n\r\n" .
-                        $fileContent . "\r\n";
+                    $body .= "--$this->boundary\r\n".
+                        "Content-Type: application/octet-stream; name=\"$fileName\"\r\n".
+                        "Content-Transfer-Encoding: base64\r\n".
+                        "Content-Disposition: attachment; filename=\"$fileName\"\r\n\r\n".
+                        $fileContent."\r\n";
                 }
                 $this->attachments = array();
             }
@@ -157,7 +157,7 @@ 
             return $this->smtpError("sending HELO command");
         }
         //auth
-        if($this->auth){
+        if ($this->auth) {
             if (!$this->smtpPutCmd("AUTH LOGIN", base64_encode($this->username))) {
                 return $this->smtpError("sending HELO command");
             }
@@ -308,7 +308,7 @@ 
     private function smtpPutCmd($cmd, $arg = "")
     {
         if ($arg != "") {
-            if($cmd=="") $cmd = $arg;
+            if ($cmd == "") $cmd = $arg;
             else $cmd = $cmd." ".$arg;
         }
         fputs($this->sock, $cmd."\r\n");

Braces +5 added lines, -2 removed lines

@@ -308,8 +308,11 @@
     private function smtpPutCmd($cmd, $arg = "")
     {
         if ($arg != "") {
-            if($cmd=="") $cmd = $arg;
-            else $cmd = $cmd." ".$arg;
+            if($cmd=="") {
+                $cmd = $arg;
+            } else {
+                $cmd = $cmd." ".$arg;
+            }
         }
         fputs($this->sock, $cmd."\r\n");
         $this->debug("> ".$cmd."\n");

src/Connector/Gateway.php

Spacing +32 added lines, -32 removed lines

@@ -17,20 +17,20 @@ 
      * @author Tinymeng <666@majiameng.com>
      * @date: 2019/9/26 15:21
      */
-    protected $host;        //发送email Host
-    protected $port;        //端口 25 or 456
-    protected $encryption;  //加密 ssl
-    protected $username;    //邮箱用户名(发送人email)
-    protected $password;    //邮箱密码(如果是第三方请去设置里获取)
-    protected $from_address;//发送人email
-
-    protected $to_address;   //接收人email
-    protected $cc_address;   //抄送人email
-    protected $bcc_address;  //隐性抄送人email
-
-    protected $log_file = false;//记录日志
+    protected $host; //发送email Host
+    protected $port; //端口 25 or 456
+    protected $encryption; //加密 ssl
+    protected $username; //邮箱用户名(发送人email)
+    protected $password; //邮箱密码(如果是第三方请去设置里获取)
+    protected $from_address; //发送人email
+
+    protected $to_address; //接收人email
+    protected $cc_address; //抄送人email
+    protected $bcc_address; //隐性抄送人email
+
+    protected $log_file = false; //记录日志
     protected $host_name = "localhost"; //is used in HELO command
-    protected $time_out = 30;//is used in fsockopen()
+    protected $time_out = 30; //is used in fsockopen()
 
     /**
      * 是否开启debug
@@ -77,16 +77,16 @@ 
             'from_address'=> '',
             'to_address'=> '',
         ];
-        $this->config = array_replace_recursive($_config,$config);
-        if(empty($this->config['from_address'])){
+        $this->config = array_replace_recursive($_config, $config);
+        if (empty($this->config['from_address'])) {
             $this->config['from_address'] = $this->config['username'];
         }
-        if(!empty($this->config['encryption'])){
-            $this->config['host'] = $this->config['encryption'] . '://' . $this->config['host'];
+        if (!empty($this->config['encryption'])) {
+            $this->config['host'] = $this->config['encryption'].'://'.$this->config['host'];
         }
 
         foreach ($this->config as $key => $value) {
-            if (property_exists($this,$key)) {
+            if (property_exists($this, $key)) {
                 $this->$key = $value;
             }
         }
@@ -119,7 +119,7 @@ 
      * @author Tinymeng <666@majiameng.com>
      * @date: 2019/9/26 10:44
      */
-    public function setDebug($debug){
+    public function setDebug($debug) {
         $this->debug = $debug;
     }
 
@@ -130,7 +130,7 @@ 
      * @author Tinymeng <666@majiameng.com>
      * @date: 2019/9/26 15:20
      */
-    public function toEmail($email){
+    public function toEmail($email) {
         $this->to_address = $email;
         return $this;
     }
@@ -142,7 +142,7 @@ 
      * @author Tinymeng <666@majiameng.com>
      * @date: 2019/9/26 15:20
      */
-    public function ccEmail($email){
+    public function ccEmail($email) {
         $this->cc_address = $email;
         return $this;
     }
@@ -154,7 +154,7 @@ 
      * @author Tinymeng <666@majiameng.com>
      * @date: 2019/9/26 15:20
      */
-    public function bccEmail($email){
+    public function bccEmail($email) {
         $this->bcc_address = $email;
         return $this;
     }
@@ -164,13 +164,13 @@ 
      * @param array|string $attachments
      * @return $this
      */
-    public function addAttachments($attachments){
-        if(is_array($attachments)){
-            foreach ($attachments as $attachment){
-                if(file_exists($attachment)) $this->attachments[] = $attachment;
+    public function addAttachments($attachments) {
+        if (is_array($attachments)) {
+            foreach ($attachments as $attachment) {
+                if (file_exists($attachment)) $this->attachments[] = $attachment;
             }
-        }else{
-            if(file_exists($attachments)) $this->attachments[] = $attachments;
+        } else {
+            if (file_exists($attachments)) $this->attachments[] = $attachments;
         }
         return $this;
     }
@@ -180,10 +180,10 @@ 
      * @param array|string $headers
      * @return $this
      */
-    public function addHeaders($headers){
-        if(is_array($headers)){
-            $this->headers = array_merge($this->headers,$headers);
-        }else{
+    public function addHeaders($headers) {
+        if (is_array($headers)) {
+            $this->headers = array_merge($this->headers, $headers);
+        } else {
             $this->headers[] = $headers;
         }
         return $this;

Braces +8 added lines, -4 removed lines

@@ -167,10 +167,14 @@ 
     public function addAttachments($attachments){
         if(is_array($attachments)){
             foreach ($attachments as $attachment){
-                if(file_exists($attachment)) $this->attachments[] = $attachment;
+                if(file_exists($attachment)) {
+                    $this->attachments[] = $attachment;
+                }
+            }
+        } else{
+            if(file_exists($attachments)) {
+                $this->attachments[] = $attachments;
             }
-        }else{
-            if(file_exists($attachments)) $this->attachments[] = $attachments;
         }
         return $this;
     }
@@ -183,7 +187,7 @@ 
     public function addHeaders($headers){
         if(is_array($headers)){
             $this->headers = array_merge($this->headers,$headers);
-        }else{
+        } else{
             $this->headers[] = $headers;
         }
         return $this;

src/Email.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
      */
     protected static function init($gateway, $config = null)
     {
-        $class = __NAMESPACE__ . '\\Gateways\\' . ucfirst(strtolower($gateway));
+        $class = __NAMESPACE__.'\\Gateways\\'.ucfirst(strtolower($gateway));
         if (class_exists($class)) {
             $app = new $class($config);
             return $app;

example/sendmail.php

Indentation +3 added lines, -3 removed lines

@@ -33,9 +33,9 @@
 $state = $email->sendmail( $mailtitle, $mailcontent, $mailtype);
 echo "<div style='width:300px; margin:36px auto;'>";
 if($state==""){
-	echo "对不起，邮件发送失败！请检查邮箱填写是否有误。";
-	echo "<a href='index.html'>点此返回</a>";
-	exit();
+    echo "对不起，邮件发送失败！请检查邮箱填写是否有误。";
+    echo "<a href='index.html'>点此返回</a>";
+    exit();
 }
 echo "恭喜！邮件发送成功！！";
 echo "<a href='index.html'>点此返回</a>";

Spacing +6 added lines, -6 removed lines

@@ -16,12 +16,12 @@ 
 ];
 //******************** 配置信息 end ********************************
 
-$smtpemailto = $_POST['toemail'];//发送给谁
-$mailtitle = $_POST['title'];//邮件主题
-$mailcontent = "<h1>".$_POST['content']."</h1>";//邮件内容
+$smtpemailto = $_POST['toemail']; //发送给谁
+$mailtitle = $_POST['title']; //邮件主题
+$mailcontent = "<h1>".$_POST['content']."</h1>"; //邮件内容
 
 $email = Email::smtp($config);
-$email->setDebug(true);//线上注释此行
+$email->setDebug(true); //线上注释此行
 $email->toEmail($smtpemailto);
 $mailtype = "html";
 //$cc = "xxx2886@qq.com";
@@ -30,9 +30,9 @@ 
 //$email->addAttachments($attachments);//添加附件
 //$email->ccEmail($cc);//抄送人
 //$email->bccEmail($bcc);//隐性抄送人
-$state = $email->sendmail( $mailtitle, $mailcontent, $mailtype);
+$state = $email->sendmail($mailtitle, $mailcontent, $mailtype);
 echo "<div style='width:300px; margin:36px auto;'>";
-if($state==""){
+if ($state == "") {
 	echo "对不起，邮件发送失败！请检查邮箱填写是否有误。";
 	echo "<a href='index.html'>点此返回</a>";
 	exit();