public/mailtrain
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Add X-Mailer header option in settings to override or disable it.

Browse source
This commit is contained in:
Raphael Hittich 2018-07-27 14:46:46 +02:00
parent 206e7a5b52
commit 44fe8882b8
5 changed files with 27 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
meta.json
View file

@ -1,3 +1,3 @@
{
"schemaVersion": 30
"schemaVersion": 31
}

2
routes/settings.js
View file

@ -16,7 +16,7 @@ let _ = require('../lib/translate')._;
let settings = require('../lib/models/settings');
let allowedKeys = ['service_url', 'smtp_hostname', 'smtp_port', 'smtp_encryption', 'smtp_disable_auth', 'smtp_user', 'smtp_pass', 'admin_email', 'smtp_log', 'smtp_max_connections', 'smtp_max_messages', 'smtp_self_signed', 'default_from', 'default_address', 'default_subject', 'default_homepage', 'default_postaddress', 'default_sender', 'verp_hostname', 'verp_use', 'disable_wysiwyg', 'pgp_private_key', 'pgp_passphrase', 'ua_code', 'shoutout', 'disable_confirmations', 'smtp_throttling', 'dkim_api_key', 'dkim_private_key', 'dkim_selector', 'dkim_domain', 'mail_transport', 'ses_key', 'ses_secret', 'ses_region'];
let allowedKeys = ['service_url', 'smtp_hostname', 'smtp_port', 'smtp_encryption', 'smtp_disable_auth', 'smtp_user', 'smtp_pass', 'admin_email', 'smtp_log', 'smtp_max_connections', 'smtp_max_messages', 'smtp_self_signed', 'default_from', 'default_address', 'default_subject', 'default_homepage', 'default_postaddress', 'default_sender', 'verp_hostname', 'verp_use', 'disable_wysiwyg', 'pgp_private_key', 'pgp_passphrase', 'ua_code', 'shoutout', 'disable_confirmations', 'smtp_throttling', 'dkim_api_key', 'dkim_private_key', 'dkim_selector', 'dkim_domain', 'mail_transport', 'ses_key', 'ses_secret', 'ses_region', 'x_mailer'];
router.all('/*', (req, res, next) => {
if (!req.user) {

4
services/sender.js
View file

@ -312,7 +312,7 @@ function formatMessage(message, callback) {
return callback(new Error(_('List not found')));
}
settings.list(['serviceUrl', 'verpUse', 'verpHostname'], (err, configItems) => {
settings.list(['serviceUrl', 'verpUse', 'verpHostname', 'xMailer'], (err, configItems) => {
if (err) {
return callback(err);
}
@ -390,7 +390,7 @@ function formatMessage(message, callback) {
address: campaign.address
},
replyTo: campaign.replyTo,
xMailer: 'Mailtrain Mailer (+https://mailtrain.org)',
xMailer: configItems.xMailer ? configItems.xMailer : false,
to: {
name: [].concat(message.subscription.firstName || []).concat(message.subscription.lastName || []).join(' '),
address: message.subscription.email

15
setup/sql/upgrade-00031.sql Normal file
View file

@ -0,0 +1,15 @@
# Header section
# Define incrementing schema version number
SET @schema_version = '31';
# Set default X-Mailer header value
LOCK TABLES `settings` WRITE;
INSERT INTO `settings` (`key`, `value`) VALUES ('x_mailer','Mailtrain Mailer (+https://mailtrain.org)') ON DUPLICATE KEY UPDATE `value`='Mailtrain Mailer (+https://mailtrain.org)';
UNLOCK TABLES;
# Footer section. Updates schema version in settings
LOCK TABLES `settings` WRITE;
/*!40000 ALTER TABLE `settings` DISABLE KEYS */;
INSERT INTO `settings` (`key`, `value`) VALUES('db_schema_version', @schema_version) ON DUPLICATE KEY UPDATE `value`=@schema_version;
/*!40000 ALTER TABLE `settings` ENABLE KEYS */;
UNLOCK TABLES;

8
views/settings.hbs
View file

@ -74,6 +74,14 @@
</div>
</div>
<div class="form-group">
<label for="x-mailer" class="col-sm-2 control-label">{{#translate}}X-Mailer header{{/translate}}</label>
<div class="col-sm-10">
<input type="text" class="form-control" name="x-mailer" id="x-mailer" value="{{xMailer}}">
<span class="help-block">{{#translate}}Set a custom X-Mailer header value or leave empty to disable it{{/translate}}</span>
</div>
</div>
</fieldset>
<fieldset>