mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-22 14:41:29 +01:00
allow to modify/preset the Message Date; make public SetMessageType
This commit is contained in:
parent
1a59b91707
commit
181296df72
@ -96,6 +96,12 @@ class PHPMailer {
|
|||||||
*/
|
*/
|
||||||
public $Sender = '';
|
public $Sender = '';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets the Date of a mail if set
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
|
public $RFCDateToSet = '';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sets the Subject of the message.
|
* Sets the Subject of the message.
|
||||||
* @var string
|
* @var string
|
||||||
@ -1114,7 +1120,7 @@ class PHPMailer {
|
|||||||
$this->boundary[1] = 'b1_' . $uniq_id;
|
$this->boundary[1] = 'b1_' . $uniq_id;
|
||||||
$this->boundary[2] = 'b2_' . $uniq_id;
|
$this->boundary[2] = 'b2_' . $uniq_id;
|
||||||
|
|
||||||
$result .= $this->HeaderLine('Date', self::RFCDate());
|
$result .= $this->HeaderLine('Date', (!empty($this->RFCDateToSet)?$this->RFCDateToSet:self::RFCDate()));
|
||||||
if($this->Sender == '') {
|
if($this->Sender == '') {
|
||||||
$result .= $this->HeaderLine('Return-Path', trim($this->From));
|
$result .= $this->HeaderLine('Return-Path', trim($this->From));
|
||||||
} else {
|
} else {
|
||||||
@ -1357,7 +1363,7 @@ class PHPMailer {
|
|||||||
* @access private
|
* @access private
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
private function SetMessageType() {
|
public function SetMessageType() {
|
||||||
if(count($this->attachment) < 1 && strlen($this->AltBody) < 1) {
|
if(count($this->attachment) < 1 && strlen($this->AltBody) < 1) {
|
||||||
$this->message_type = 'plain';
|
$this->message_type = 'plain';
|
||||||
} else {
|
} else {
|
||||||
|
Loading…
Reference in New Issue
Block a user