specter/CyTube
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fixed email not getting sent from correct email in config. Added way to

Browse source 
change the default name (CyTube Services) that email is sent from.
This commit is contained in:
bush 2015-02-20 07:53:33 +11:00
parent bed10ec8a9
commit 407f8930c3
3 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
config.template.yaml
View file

@ -109,6 +109,7 @@ mail:
user: 'some.user@gmail.com' user: 'some.user@gmail.com'
pass: 'supersecretpassword' pass: 'supersecretpassword'
from-address: 'some.user@gmail.com' from-address: 'some.user@gmail.com'
from-name: 'CyTube Services'
# GData API v2 developer key (for non-anonymous youtube requests) # GData API v2 developer key (for non-anonymous youtube requests)
youtube-v2-key: '' youtube-v2-key: ''

1
lib/config.js
View file

@ -54,6 +54,7 @@ var defaults = {
/* the key "config" is omitted because the format depends on the /* the key "config" is omitted because the format depends on the
service the owner is configuring for nodemailer */ service the owner is configuring for nodemailer */
"from-address": "some.user@gmail.com" "from-address": "some.user@gmail.com"
"from-name": "CyTube Services"
}, },
"youtube-v2-key": "", "youtube-v2-key": "",
"channel-save-interval": 5, "channel-save-interval": 5,

2
lib/web/account.js
View file

@ -621,7 +621,7 @@ function handlePasswordReset(req, res) {
Config.get("http.domain") + "/account/passwordrecover/"+hash; Config.get("http.domain") + "/account/passwordrecover/"+hash;
var mail = { var mail = {
from: "CyTube Services <" + Config.get("mail.from") + ">", from: Config.get("mail.from-name") + " <" + Config.get("mail.from-address") + ">",
to: email, to: email,
subject: "Password reset request", subject: "Password reset request",
text: msg text: msg