projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add an embedded mode for platal.
[platal.git]
/
classes
/
plmailer.php
diff --git
a/classes/plmailer.php
b/classes/plmailer.php
index
f7deb49
..
ce3df4c
100644
(file)
--- a/
classes/plmailer.php
+++ b/
classes/plmailer.php
@@
-176,7
+176,7
@@
class PlMailer extends Mail_Mime {
if ($email instanceof PlUser) {
$email = self::formatUser($email);
}
if ($email instanceof PlUser) {
$email = self::formatUser($email);
}
- $email = preg_replace('!(^|, *)([^<"]+?) *(<[^>]*>)!u
e
',
+ $email = preg_replace('!(^|, *)([^<"]+?) *(<[^>]*>)!u',
'\1 "\2" \3', $email);
return preg_replace('/"([^<]+)"/e',
'"\\"" . PlMailer::encodeStringQP("\1") . "\\""',
'\1 "\2" \3', $email);
return preg_replace('/"([^<]+)"/e',
'"\\"" . PlMailer::encodeStringQP("\1") . "\\""',
@@
-193,6
+193,12
@@
class PlMailer extends Mail_Mime {
}
}
}
}
+ public function setTo($email)
+ {
+ $email = $this->correct_emails($email);
+ $this->_headers['To'] = $email;
+ }
+
public function addCc($email)
{
return parent::addCc($this->correct_emails($email));
public function addCc($email)
{
return parent::addCc($this->correct_emails($email));
@@
-327,7
+333,7
@@
class PlMailer extends Mail_Mime {
public function sendTo(PlUser &$user)
{
public function sendTo(PlUser &$user)
{
- $this->
add
To($user);
+ $this->
set
To($user);
$this->assign_by_ref('user', $user);
return $this->send($user->isEmailFormatHtml());
}
$this->assign_by_ref('user', $user);
return $this->send($user->isEmailFormatHtml());
}