holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

allow to access ReplyTo of MailObject by extending classes; provide Function to retrieve replyTo Address; alter Method to detect wether a filename is already encoded, and if - do not try to use the basename as filename

Browse Source
This commit is contained in:
Klaus Leithoff 2012-11-05 08:48:13 +00:00
parent b48e399253
commit 4957c77f74
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
phpgwapi/inc/class.egw_mailer.inc.php
View File

@ -199,6 +199,18 @@ class egw_mailer extends PHPMailer
return parent::AddBCC($address, $name); return parent::AddBCC($address, $name);
} }
/**
* Gets the "ReplyTo" addresses.
*
* Function to retrieve the ReplyTo Addresses of the SMT Mailobject
*
* @return array with the reply-to mail addresse(s))
*/
public function GetReplyTo()
{
return $this->ReplyTo;
}
/** /**
* Adds a string or binary attachment (non-filesystem) to the list. * Adds a string or binary attachment (non-filesystem) to the list.
* This method can be used to attach ascii or binary data, * This method can be used to attach ascii or binary data,
@ -214,7 +226,7 @@ class egw_mailer extends PHPMailer
// Append to $attachment array // Append to $attachment array
//already encoded? //already encoded?
//TODO: maybe add an parameter to AddStringAttachment to avoid using the basename //TODO: maybe add an parameter to AddStringAttachment to avoid using the basename
$x += preg_match_all('/[\000-\010\013\014\016-\037\177-\377]/', $filename, $matches); $x += preg_match('/\?=.+=\?/', $filename);
$this->attachment[] = array( $this->attachment[] = array(
0 => $string, 0 => $string,
1 => $filename, 1 => $filename,
@ -226,5 +238,4 @@ class egw_mailer extends PHPMailer
7 => 0 7 => 0
); );
} }
} }

2
phpgwapi/inc/class.phpmailer.inc.php
View File

@ -343,7 +343,7 @@ class PHPMailer {
private $to = array(); private $to = array();
private $cc = array(); private $cc = array();
private $bcc = array(); private $bcc = array();
private $ReplyTo = array(); protected $ReplyTo = array(); //this way extended classes may use this variable
private $all_recipients = array(); private $all_recipients = array();
protected $attachment = array(); //this way extended classes may use this variable protected $attachment = array(); //this way extended classes may use this variable
private $CustomHeader = array(); private $CustomHeader = array();