fix for mail problem

This commit is contained in:
wclouser%mozilla.com 2006-07-21 19:58:41 +00:00
parent 25fb925abd
commit 141b26a409
2 changed files with 6 additions and 4 deletions

View File

@ -62,7 +62,8 @@ class UsersController extends AppController {
// If they've already signed up, send them another email // If they've already signed up, send them another email
if ($this->User->findByEmail($this->params['data']['User']['email'])) { if ($this->User->findByEmail($this->params['data']['User']['email'])) {
$mail_params = array( $mail_params = array(
'from' => '"Firefox User Panel" <nobody@mozilla.com>', 'from' => 'Firefox User Panel <nobody@mozilla.com>',
'envelope' => 'nobody@mozilla.com',
'to' => $this->params['data']['User']['email'], 'to' => $this->params['data']['User']['email'],
'subject' => 'Firefox User Panel', 'subject' => 'Firefox User Panel',
'message' => " 'message' => "
@ -110,8 +111,9 @@ use in marketing or solicitation.</small></p>
} }
if ($this->User->save($this->params['data'])) { if ($this->User->save($this->params['data'])) {
$mail_params = array( $mail_params = array(
'from' => '"Firefox User Panel" <nobody@mozilla.com>', 'from' => 'Firefox User Panel <nobody@mozilla.com>',
'to' => $this->params['data']['User']['email'], 'to' => $this->params['data']['User']['email'],
'envelope' => 'nobody@mozilla.com',
'subject' => 'Firefox User Panel', 'subject' => 'Firefox User Panel',
'message' => " 'message' => "
<p>Thanks for volunteering to be a part of the Firefox User Panel!</p> <p>Thanks for volunteering to be a part of the Firefox User Panel!</p>

View File

@ -47,8 +47,8 @@ class mail
} }
function make_additional_parameters() function make_additional_parameters()
{ {
if (!empty($this->from)) { if (!empty($this->envelope)) {
return '-f'.$this->from; return '-f'.$this->envelope;
} }
} }
function send() function send()