nodemailer
Advanced tools
Comparing version 0.3.15 to 0.3.16
var Transport = require("./transport").Transport, | ||
MailComposer = require("mailcomposer").MailComposer, | ||
XOAuthGenerator = require("./xoauth").XOAuthGenerator, | ||
helpers = require("./helpers"); | ||
helpers = require("./helpers"), | ||
packageData; | ||
try{ | ||
packageData = require("../package.json"); | ||
}catch(E){ | ||
// probably node 0.4 which doesn't support loading json files as objects | ||
packageData = JSON.parse( | ||
require("fs"). | ||
readFileSync( | ||
require("path"). | ||
join( | ||
__dirname, | ||
"..", | ||
"package.json" | ||
) | ||
) | ||
); | ||
} | ||
/* | ||
@@ -10,6 +29,6 @@ * Version constants | ||
var X_MAILER_NAME = "Nodemailer", | ||
X_MAILER_VERSION = "0.3.14; +https://github.com/andris9/Nodemailer"; | ||
X_MAILER_HOMEPAGE = "http://andris9.github.com/Nodemailer/"; | ||
module.exports.X_MAILER_NAME = X_MAILER_NAME; | ||
module.exports.X_MAILER_VERSION = X_MAILER_VERSION; | ||
module.exports.X_MAILER_HOMEPAGE = X_MAILER_HOMEPAGE; | ||
@@ -20,4 +39,4 @@ // Export createTransport method | ||
transport.sendMail = function(options, callback){ | ||
options = options || {}; | ||
options.transport = options.transport || transport; | ||
options = options || {}; | ||
options.transport = options.transport || transport; | ||
sendMail(options, callback); | ||
@@ -30,3 +49,3 @@ }; | ||
module.exports.createXOAuthGenerator = function(options){ | ||
return new XOAuthGenerator(options); | ||
return new XOAuthGenerator(options); | ||
}; | ||
@@ -81,2 +100,21 @@ | ||
/** | ||
* <p>Generates an user agent string for Nodemailer with homepage, version etc.</p> | ||
* | ||
* @return {String} user agent string for X-Mailer value | ||
*/ | ||
Nodemailer.prototype.generateUserAgentString = function(){ | ||
var details = []; | ||
if(packageData.version){ | ||
details.push(packageData.version); | ||
} | ||
if(X_MAILER_HOMEPAGE){ | ||
details.push("+"+X_MAILER_HOMEPAGE); | ||
} | ||
return X_MAILER_NAME+ (details.length?" ("+details.join("; ")+")":""); | ||
}; | ||
/** | ||
* <p>Add support for legacy transport settings by checking for global | ||
@@ -218,4 +256,3 @@ * variables SMTP, sendmail and SES</p> | ||
// Mailer name + version | ||
this.mailcomposer.addHeader("X-Mailer", X_MAILER_NAME+ | ||
(X_MAILER_VERSION?" ("+X_MAILER_VERSION+")":"")); | ||
this.mailcomposer.addHeader("X-Mailer", this.generateUserAgentString); | ||
@@ -222,0 +259,0 @@ // Date |
{ | ||
"name": "nodemailer", | ||
"description": "Easy to use module to send e-mails, supports unicode and SSL/TLS", | ||
"version": "0.3.15", | ||
"version": "0.3.16", | ||
"author" : "Andris Reinman", | ||
@@ -6,0 +6,0 @@ "maintainers":[ |
@@ -30,2 +30,6 @@ Nodemailer | ||
## Support Nodemailer development | ||
[![Donate to author](https://www.paypalobjects.com/en_US/i/btn/btn_donate_SM.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=DB26KWR2BQX5W) | ||
## Check out my other mail related modules | ||
@@ -32,0 +36,0 @@ |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
108067
1399
533
3