phpmailer: adding replyTo-Adresses to log (#5425)

Co-authored-by: Gregor Harlan <330436+gharlan@users.noreply.github.com>
redaxo · Dec 30, 2022 · cc70617 · cc70617
1 parent e67e7c9
commit cc70617
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/.tools/psalm/baseline.xml b/.tools/psalm/baseline.xml
@@ -2001,7 +2001,8 @@
       <code>$this-&gt;xHeader[$kind]</code>
       <code>$this-&gt;xHeader['to']</code>
     </MixedArgument>
-    <MixedArgumentTypeCoercion occurrences="1">
+    <MixedArgumentTypeCoercion occurrences="2">
+      <code>array_column($this-&gt;getReplyToAddresses(), 0)</code>
       <code>array_column($this-&gt;getToAddresses(), 0)</code>
     </MixedArgumentTypeCoercion>
     <MixedArrayOffset occurrences="1">

diff --git a/redaxo/src/addons/phpmailer/lib/mailer.php b/redaxo/src/addons/phpmailer/lib/mailer.php
@@ -170,10 +170,15 @@ public function clearAllRecipients()
 
     private function log(string $success): void
     {
+        $replytos = '';
+        if (count($this->getReplyToAddresses()) > 0) {
+            $replytos = implode(', ', array_column($this->getReplyToAddresses(), 0));
+        }
+
         $log = new rex_log_file(self::logFile(), 2000000);
         $data = [
             $success,
-            $this->From,
+            $this->From.($replytos ? '; reply-to: '.$replytos : ''),
             implode(', ', array_column($this->getToAddresses(), 0)),
             $this->Subject,
             trim(str_replace('https://github.com/PHPMailer/PHPMailer/wiki/Troubleshooting', '', strip_tags($this->ErrorInfo))),