frodovdr
/
node-red-nodes
mirror of https://github.com/node-red/node-red-nodes.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed #222 - RFC error with invalid FROM address with userid conf (#223) 

* Fixed #222 - RFC error with invalide FROM address forcing userid config value

* Added user help text for #222 fix and pull request

* Fixing tab spacing for #222 fix before pull request acceptance
This commit is contained in:
Mike Sparr 2016-08-03 01:55:39 -06:00 committed by Dave Conway-Jones
parent 69b471b0f1
commit 17255b7bbf
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
social/email/61-email.html
View File

@ -70,6 +70,8 @@
<script type="text/x-red" data-help-name="e-mail"> <script type="text/x-red" data-help-name="e-mail">
<p>Sends the <code>msg.payload</code> as an email, with a subject of <code>msg.topic</code>.</p> <p>Sends the <code>msg.payload</code> as an email, with a subject of <code>msg.topic</code>.</p>
<p>You may optionally set <code>msg.from</code> in the payload which will override the <code>node.userid</code>
default value.</p>
<p>The default message recipient can be configured in the node, if it is left <p>The default message recipient can be configured in the node, if it is left
blank it should be set using the <code>msg.to</code> property of the incoming message. If left blank blank it should be set using the <code>msg.to</code> property of the incoming message. If left blank
you can also specify <code>msg.cc</code> and/or <code>msg.bcc</code> properties.</p> you can also specify <code>msg.cc</code> and/or <code>msg.bcc</code> properties.</p>
@ -133,8 +135,8 @@
</select> </select>
</div> </div>
<div class="form-row"> <div class="form-row">
<label for="node-input-useSSL"><i class="fa fa-lock"></i> <span data-i18n="email.label.useSSL"></span></label> <label for="node-input-useSSL"><i class="fa fa-lock"></i> <span data-i18n="email.label.useSSL"></span></label>
<input type="checkbox" id="node-input-useSSL" style="width: auto;"> <input type="checkbox" id="node-input-useSSL" style="width: auto;">
</div> </div>
<div class="form-row"> <div class="form-row">
<label for="node-input-server"><i class="fa fa-globe"></i> <span data-i18n="email.label.server"></span></label> <label for="node-input-server"><i class="fa fa-globe"></i> <span data-i18n="email.label.server"></span></label>
@ -157,7 +159,7 @@
<input type="text" id="node-input-box"> <input type="text" id="node-input-box">
</div> </div>
<div class="form-row node-input-disposition"> <div class="form-row node-input-disposition">
<label for="node-input-disposition"><i class="fa fa-trash"></i> <span data-i18n="email.label.disposition"></span></label> <label for="node-input-disposition"><i class="fa fa-trash"></i> <span data-i18n="email.label.disposition"></span></label>
<select type="text" id="node-input-disposition"> <select type="text" id="node-input-disposition">
<option value="None" selected="selected">None</option> <option value="None" selected="selected">None</option>
<option value="Read">Mark Read/Answered</option> <option value="Read">Mark Read/Answered</option>

2
social/email/61-email.js
View File

@ -86,7 +86,7 @@ module.exports = function(RED) {
if (msg.to && node.name && (msg.to !== node.name)) { if (msg.to && node.name && (msg.to !== node.name)) {
node.warn(RED._("node-red:common.errors.nooverride")); node.warn(RED._("node-red:common.errors.nooverride"));
} }
var sendopts = { from: node.userid }; // sender address var sendopts = { from: ((msg.from) ? msg.from : node.userid) }; // sender address
sendopts.to = node.name || msg.to; // comma separated list of addressees sendopts.to = node.name || msg.to; // comma separated list of addressees
if (node.name === "") { if (node.name === "") {
sendopts.cc = msg.cc; sendopts.cc = msg.cc;

4
social/email/README.md
View File

@ -39,7 +39,9 @@ Uses the *imap* npm module.
### Output ### Output
Sends the `msg.payload` as an email, with a subject of `msg.topic`. Sends the `msg.payload` as an email, with a subject of `msg.topic`. You may
optionally override the from email address by setting `msg.from` otherwise the
node will use the `node.userid` setting.
The default message recipient can be configured in the node, if it is left The default message recipient can be configured in the node, if it is left
blank it should be set using the `msg.to` property of the incoming message. blank it should be set using the `msg.to` property of the incoming message.