Merge pull request #954 from dbarzin/dev

fix mail subject
dbarzin · Nov 11, 2024 · 1fb5460 · 1fb5460
2 parents 78c4800 + 5ce8960
commit 1fb5460
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/app/Console/Commands/CertificateExpiracy.php b/app/Console/Commands/CertificateExpiracy.php
@@ -117,7 +117,6 @@ public function handle()
 
                     // Content
                     $mail->isHTML(true);                            // Set email format to HTML
-                    $mail->Subject = $subject;
 
                     // Optional: Add DKIM signing
                     $mail->DKIM_domain = env('MAIL_DKIM_DOMAIN');
@@ -127,6 +126,7 @@ public function handle()
                     $mail->DKIM_identity = $mail->From;
 
                     if ($group === null || $group === '1') {
+                        $mail->Subject = subject;
                         $message = '<html><body>These certificates are about to exipre :<br><br>';
                         foreach ($certificates as $cert) {
                             $message .= $cert->end_validity . ' - ' . $cert->name . ' - ' . $cert->type . '<br>';
@@ -142,7 +142,7 @@ public function handle()
                         Log::debug("Mail sent to {$to_email}");
                     } else {
                         foreach ($certificates as $cert) {
-                            $mailSubject = $subject . ' - ' . $cert->end_validity . ' - ' . $cert->name;
+                            $mail->Subject  = $subject . ' - ' . $cert->end_validity . ' - ' . $cert->name;
                             $message = $cert->description;
 
                             // Send mail