Merge branch '164-spam-fighting' into 'master'

Resolve "Prevent email account from being spammed"

See merge request agaric/sites/agaric-com!47
This commit is contained in:
David Valdez 2019-01-03 23:22:50 +00:00
commit f902182444
6 changed files with 89 additions and 39 deletions

View file

@ -38,7 +38,8 @@
"drupal/google_analytics": "^2.3",
"drupal/honeypot": "^1.29",
"drupal/diff": "^1.0@RC",
"drupal/menu_trail_by_path": "^1.1"
"drupal/menu_trail_by_path": "^1.1",
"drupal/antibot": "^1.2"
},
"repositories": {
"drupal": {

49
composer.lock generated
View file

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "8242eb77dab2ab68d0e0f052fffac99b",
"content-hash": "2ff581aba1400afb74b53605e46969a5",
"packages": [
{
"name": "asm89/stack-cors",
@ -2521,6 +2521,53 @@
"source": "http://cgit.drupalcode.org/allowed_formats"
}
},
{
"name": "drupal/antibot",
"version": "1.2.0",
"source": {
"type": "git",
"url": "https://git.drupal.org/project/antibot",
"reference": "8.x-1.2"
},
"dist": {
"type": "zip",
"url": "https://ftp.drupal.org/files/projects/antibot-8.x-1.2.zip",
"reference": "8.x-1.2",
"shasum": "4cb067e77929984c8cf5b05a84734c62d6fd19b3"
},
"require": {
"drupal/core": "~8.0"
},
"type": "drupal-module",
"extra": {
"branch-alias": {
"dev-1.x": "1.x-dev"
},
"drupal": {
"version": "8.x-1.2",
"datestamp": "1522335671",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
}
}
},
"notification-url": "https://packages.drupal.org/8/downloads",
"license": [
"GPL-2.0-or-later"
],
"authors": [
{
"name": "mstef",
"homepage": "https://www.drupal.org/user/107190"
}
],
"description": "Prevent forms from being submitted without JavaScript enabled",
"homepage": "https://www.drupal.org/project/antibot",
"support": {
"source": "http://cgit.drupalcode.org/antibot"
}
},
{
"name": "drupal/better_normalizers",
"version": "1.0.0-beta3",

View file

@ -0,0 +1,12 @@
form_ids:
- comment_comment_form
- user_login_form
- user_pass
- user_register_form
- contact_message_feedback_form
- contact_message_personal_form
- webform-submission-training-node-58-add-form
- webform-submission-contact-node-163-add-form
show_form_ids: 1
_core:
default_config_hash: f8-7hVX66ftHnUweoB4XDVx8q1hEr4PiqFvPvFB6yRc

View file

@ -0,0 +1,23 @@
uuid: 8d3537a1-c75d-47f2-9d56-398adc51fb6f
langcode: en
status: true
dependencies:
module:
- antibot
id: config_sync.module.antibot
snapshotSet: config_sync
extensionType: module
extensionName: antibot
items:
-
collection: ''
name: antibot.settings
data:
form_ids:
- comment_comment_form
- user_login_form
- user_pass
- user_register_form
- contact_message_feedback_form
- contact_message_personal_form
show_form_ids: false

View file

@ -5,6 +5,7 @@ module:
admin_toolbar_tools: 0
agaric_migration: 0
allowed_formats: 0
antibot: 0
automated_cron: 0
better_normalizers: 0
block: 0

View file

@ -99,7 +99,7 @@ settings:
draft_loaded_message: ''
confirmation_type: url_message
confirmation_title: ''
confirmation_message: 'Your message has been sent.'
confirmation_message: 'Thanks for reaching out! We'll get back to you as soon as one of us (probably Clayton) checks our email.'
confirmation_url: '<front>'
confirmation_attributes: { }
confirmation_back: true
@ -172,40 +172,6 @@ access:
users: { }
permissions: { }
handlers:
email_confirmation:
id: email
label: 'Email confirmation'
handler_id: email_confirmation
status: true
conditions: { }
weight: 1
settings:
states:
- completed
to_mail: '[webform_submission:values:email:raw]'
to_options: { }
cc_mail: ''
cc_options: { }
bcc_mail: ''
bcc_options: { }
from_mail: _default
from_options: { }
from_name: _default
subject: '[webform_submission:values:subject:raw]'
body: '[webform_submission:values:message:value]'
excluded_elements: { }
ignore_access: false
exclude_empty: true
exclude_empty_checkbox: false
html: true
attachments: false
twig: false
theme_name: ''
debug: false
reply_to: ''
return_path: ''
sender_mail: ''
sender_name: ''
email_notification:
id: email
label: 'Email notification'
@ -226,14 +192,14 @@ handlers:
from_options: { }
from_name: '[webform_submission:values:name:raw]'
subject: '[webform_submission:values:subject:raw]'
body: '[webform_submission:values:message:value]'
body: "Hi Agarics, \r\n\r\nYou got some fan mail.\r\n\r\nSincerely,\r\nAgaric Bot\r\n\r\n<p>Submitted on {{ webform_token('[webform_submission:created]', webform_submission) }}</p>\r\n<p>Submitted by: {{ webform_token('[webform_submission:user]', webform_submission) }}</p>\r\n<p>Submitted values are:</p>\r\n{{ webform_token('[webform_submission:values]', webform_submission) }}\r\n"
excluded_elements: { }
ignore_access: false
exclude_empty: true
exclude_empty_checkbox: false
html: true
attachments: false
twig: false
twig: true
theme_name: ''
debug: false
reply_to: ''