always set envelope sender address in ispcmail class

jnorell · jnorell · commit 7adc9b3fbf83 · 2020-11-11T13:07:22.000-07:00
diff --git a/server/lib/classes/ispcmail.inc.php b/server/lib/classes/ispcmail.inc.php
@@ -824,8 +824,7 @@ public function send($recipients) {
 				else $rec_string .= $recip;
 			}
 			$to = $this->_encodeHeader($rec_string, $this->mail_charset);
-			//$result = mail($to, $subject, $this->body, implode($this->_crlf, $headers));
-			$result = mail($to, $enc_subject, $this->body, implode($this->_crlf, $headers));
+			$result = mail($to, $enc_subject, $this->body, implode($this->_crlf, $headers), "-f $this->_mail_sender");
 		}
 
 		// Reset the subject in case mail is resent

Original file line number	Diff line number	Diff line change
`@@ -824,8 +824,7 @@ public function send($recipients) {`
`824`	`824`	`else $rec_string .= $recip;`
`825`	`825`	`}`
`826`	`826`	`$to = $this->_encodeHeader($rec_string, $this->mail_charset);`
`827`		`- //$result = mail($to, $subject, $this->body, implode($this->_crlf, $headers));`
`828`		`- $result = mail($to, $enc_subject, $this->body, implode($this->_crlf, $headers));`
	`827`	`+ $result = mail($to, $enc_subject, $this->body, implode($this->_crlf, $headers), "-f $this->_mail_sender");`
`829`	`828`	`}`
`830`	`829`
`831`	`830`	`// Reset the subject in case mail is resent`