Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-10 16:05:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #3427

Browse Source
This commit is contained in:
barisusakli
2015-08-18 15:01:36 -04:00
parent 5b87af4389
commit 7bd98a2516
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/emailer.js
View File

@@ -71,6 +71,7 @@ var fs = require('fs'),
Plugins.fireHook('action:email.send', { Plugins.fireHook('action:email.send', {
to: email, to: email,
from: meta.config['email:from'] || 'no-reply@localhost.lan', from: meta.config['email:from'] || 'no-reply@localhost.lan',
from_name: meta.config['email:from_name'] || 'NodeBB',
subject: translated[2], subject: translated[2],
html: translated[0], html: translated[0],
plaintext: translated[1], plaintext: translated[1],

7
src/views/admin/settings/email.tpl
View File

@@ -14,6 +14,13 @@
</p> </p>
<input type="text" class="form-control input-lg" id="email:from" data-field="email:from" placeholder="info@example.org" /><br /> <input type="text" class="form-control input-lg" id="email:from" data-field="email:from" placeholder="info@example.org" /><br />
</div> </div>
<div class="form-group">
<label for="email:from_name"><strong>From Name</strong></label>
<p class="help-block">
The from name to display in the email.
</p>
<input type="text" class="form-control input-lg" id="email:from_name" data-field="email:from_name" placeholder="NodeBB" /><br />
</div>
<button class="btn btn-block btn-default" type="button" data-action="email.test">Send Test Email</button> <button class="btn btn-block btn-default" type="button" data-action="email.test">Send Test Email</button>
<p class="help-block"> <p class="help-block">
The test email will be sent to the currently logged in user's email address. The test email will be sent to the currently logged in user's email address.