Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Command line file inclusion fix

  • Loading branch information...
commit 6356572ae700e9765701d7eb33a59bc7c0fff778 1 parent 017c231
Andris Reinman authored
Showing with 5 additions and 5 deletions.
  1. +4 −4 bin/nodemailer
  2. +1 −1  package.json
View
8 bin/nodemailer
@@ -36,7 +36,7 @@ if(argv.help){
console.log(" --textFile=[path] Plain text mail body from a file");
console.log(" --htmlFile=[path] HTML mail body from a file");
console.log(" --stdin=[target] Read \"text\" or \"html\" from stdin");
- console.log(" --attachments=[pathlist] Comma separated list of file paths");
+ console.log(" --attachments=[pathlist] Comma separated list of file paths");
console.log("");
console.log("Example:")
console.log("nodemailer --host=smtp.gmail.com --port=465 --secure=true --user=\"myuser@gmail.com\" --pass=\"mypass\" --from=\"myuser@gmail.com\" --to=\"target@example.com\" --subject=\"test\" --text=\"hello world!\"");
@@ -62,7 +62,7 @@ var transportType = (argv.transport || configFile.transport || process.env.NODE
secret = argv.secret || configFile.secret || process.env.NODEMAILER_SECRET;
if(!transportType){
- transportType = host?"smtp":"sendmail";
+ transportType = host?"smtp": (key?"ses":"sendmail");
}
secure = ["false", "null", "0", "undefined"].indexOf(secure)>=0 ? false : !!secure;
@@ -112,11 +112,11 @@ if(attachments.length){
}
if(argv.textFile){
- argv.text = require("fs").readFileSync(argv.textFile, "utf-8");
+ text = require("fs").readFileSync(argv.textFile, "utf-8");
}
if(argv.htmlFile){
- argv.html = require("fs").readFileSync(argv.htmlFile, "utf-8");
+ html = require("fs").readFileSync(argv.htmlFile, "utf-8");
}
if(argv.stdin){
View
2  package.json
@@ -1,7 +1,7 @@
{
"name": "nodemailer",
"description": "Easy to use module to send e-mails, supports unicode and SSL/TLS",
- "version": "0.3.24",
+ "version": "0.3.25",
"author" : "Andris Reinman",
"maintainers":[
{
Please sign in to comment.
Something went wrong with that request. Please try again.