From 51791d8ca6c8756fb02560a3b07cd52af2b2447c Mon Sep 17 00:00:00 2001 From: pzinovkin Date: Mon, 13 Apr 2009 10:31:44 +0000 Subject: [PATCH] email changes git-svn-id: svn+ssh://code.netmonsters.ru/svn/majestic/trunk@72 4cb57b5f-5bbd-dd11-951b-001d605cbbc5 --- classes/Mailer.class.php | 2 +- classes/User.class.php | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/classes/Mailer.class.php b/classes/Mailer.class.php index 9d6d776..8a7bb5e 100644 --- a/classes/Mailer.class.php +++ b/classes/Mailer.class.php @@ -57,7 +57,7 @@ class Mailer $this->templater->assign($key, $val); } - $message = $this->templater->fetch($this->template.'.tpl') . "\r\n\r\nС любовью @робот."; + $message = $this->templater->fetch($this->template.'.tpl'); $encoded_subject = '=?UTF-8?B?' . base64_encode($subject) . "?=\r\n"; return mail($mail, $subject, $message, $this->headers); } diff --git a/classes/User.class.php b/classes/User.class.php index 90db477..01c9802 100644 --- a/classes/User.class.php +++ b/classes/User.class.php @@ -132,8 +132,11 @@ class User $link = 'http://' . $settings['host_name'] . '/activate/?key=' . $model->generateKey($login, $mail); $mailer = new Mailer('UserRegister'); - return $mailer->send($mail, 'Подтверждени E-mail ' . $settings['host_name'], array('link' => $link, 'site_name' => $settings['site_url'])); + return $mailer->send($mail, 'Подтверждени E-mail ' . $settings['host_name'], array( + 'link' => $link, + 'site_name' => $settings['site_url'], + 'email' => $mail, + )); } - } ?> \ No newline at end of file