Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-31 19:15:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed email meta changes

Browse Source
This commit is contained in:
Baris Usakli
2013-09-26 13:31:38 -04:00
parent 9c14618d55
commit 942a21b4be
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/user.js
View File

@@ -3,7 +3,7 @@ var utils = require('./../public/src/utils.js'),
crypto = require('crypto'), crypto = require('crypto'),
emailjs = require('emailjs'), emailjs = require('emailjs'),
meta = require('./meta.js'), meta = require('./meta.js'),
emailjsServer = emailjs.server.connect(meta.config.mailer || '127.0.0.1'), emailjsServer = emailjs.server.connect(meta.config['email:smtp:host'] || '127.0.0.1'),
bcrypt = require('bcrypt'), bcrypt = require('bcrypt'),
Groups = require('./groups'), Groups = require('./groups'),
notifications = require('./notifications.js'), notifications = require('./notifications.js'),
@@ -484,7 +484,7 @@ var utils = require('./../public/src/utils.js'),
// Send intro email w/ confirm code // Send intro email w/ confirm code
var message = emailjs.message.create({ var message = emailjs.message.create({
text: confirm_email_plaintext, text: confirm_email_plaintext,
from: meta.config.mailer.from, from: meta.config['email:from'] || 'localhost@example.org',
to: email, to: email,
subject: '[NodeBB] Registration Email Verification', subject: '[NodeBB] Registration Email Verification',
attachment: [{ attachment: [{
@@ -815,7 +815,7 @@ var utils = require('./../public/src/utils.js'),
var message = emailjs.message.create({ var message = emailjs.message.create({
text: reset_email_plaintext, text: reset_email_plaintext,
from: meta.config.mailer ? meta.config.mailer.from : 'localhost@example.org', from: meta.config['email:from'] ? meta.config['email:from'] : 'localhost@example.org',
to: email, to: email,
subject: 'Password Reset Requested', subject: 'Password Reset Requested',
attachment: [{ attachment: [{