Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/site/app/controllers/components/email.php
diff options
context:
space:
mode:
Diffstat (limited to 'site/app/controllers/components/email.php')
-rw-r--r--site/app/controllers/components/email.php9
1 files changed, 1 insertions, 8 deletions
diff --git a/site/app/controllers/components/email.php b/site/app/controllers/components/email.php
index 71f20ac..83708b4 100644
--- a/site/app/controllers/components/email.php
+++ b/site/app/controllers/components/email.php
@@ -12,7 +12,6 @@ class EmailComponent
*/
var $from = NOBODY_EMAIL;
var $fromName = SITE_NAME;
- var $sender = null;
//var $smtpUserName = 'username'; // SMTP username
//var $smtpPassword = 'password'; // SMTP password
//var $smtpHostNames= "smtp1.example.com;smtp2.example.com"; // specify main and backup server
@@ -71,14 +70,8 @@ class EmailComponent
//$mail->Username = $this->smtpUserName;
//$mail->Password = $this->smtpPassword;
+ $mail->Sender = $this->from;
$mail->From = $this->from;
- // if "Sender" field is set, add correct Sender header (cf. RFC5322 ยง 3.6.2)
- if (!empty($this->sender)) {
- $mail->Sender = $this->sender;
- $mail->AddCustomHeader("Sender: {$this->sender}");
- } else {
- $mail->Sender = $this->from;
- }
$mail->FromName = $this->fromName;
$mail->AddAddress($this->to, $this->toName );
if ($reply)