rainbownapkin/fore.st
1
0
Fork 0
Code Issues 13 Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #449 from 6IRCNet/3.0

Browse source 
Fix email from address and allow changing sender name
This commit is contained in:
Calvin Montgomery 2015-02-19 15:23:44 -06:00
parent bed10ec8a9 ff8a9d02fe
commit cdcace828f
3 changed files with 4 additions and 2 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: ''

3
lib/config.js
View file

@ -53,7 +53,8 @@ var defaults = {
enabled: false, enabled: false,
/* 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