Merge pull request #203 from dbarzin/dev

fix unsedure mail sending
dbarzin · Oct 21, 2024 · 6d5519d · 6d5519d
2 parents 2cb16df + ebab4fe
commit 6d5519d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/app/Console/Commands/SendNotifications.php b/app/Console/Commands/SendNotifications.php
@@ -66,7 +66,9 @@ public function handle()
                 $mail->SMTPAuth   = env('MAIL_AUTH');          // Enable SMTP authentication
                 $mail->Username   = env('MAIL_USERNAME');      // SMTP username
                 $mail->Password   = env('MAIL_PASSWORD');      // SMTP password
-                $mail->SMTPSecure = env('MAIL_SMTPSECURE');    // Enable TLS encryption, `ssl` also accepted
+                $mail->SMTPSecure = env('MAIL_SMTPSECURE',false);    // Enable TLS encryption, `ssl` also accepted
+                if ($mail->SMTPSecure==false)
+                    $mail->SMTPAutoTLS=false;
                 $mail->Port       = env('MAIL_PORT');          // TCP port to connect to
 
                 // Loop on all users

diff --git a/app/Http/Controllers/ConfigurationController.php b/app/Http/Controllers/ConfigurationController.php
@@ -79,7 +79,9 @@ public function save(Request $request)
                     $mail->SMTPAuth   = env('MAIL_AUTH');          // Enable SMTP authentication
                     $mail->Username   = env('MAIL_USERNAME');      // SMTP username
                     $mail->Password   = env('MAIL_PASSWORD');      // SMTP password
-                    $mail->SMTPSecure = env('MAIL_SMTPSECURE');    // Enable TLS encryption, `ssl` also accepted
+                    $mail->SMTPSecure = env('MAIL_SMTPSECURE',false);    // Enable TLS encryption, `ssl` also accepted
+                    if ($mail->SMTPSecure==false)
+                        $mail->SMTPAutoTLS=false;
                     $mail->Port       = env('MAIL_PORT');          // TCP port to connect to
 
                     // Recipients