Update Composer, update everything

web/modules/contrib/webform/third_party_settings/webform.antibot.inc

@@ -0,0 +1,169 @@
+<?php
+
+/**
+ * @file
+ * Integrates third party settings on the Antibot module's behalf.
+ */
+
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Url;
+
+/**
+ * Flag to indicate that antibot can be set.
+ */
+define('WEBFORM_ANTIBOT_NEUTRAL', -1);
+
+/**
+ * Flag to indicate that antibot is disabled for all webforms.
+ */
+define('WEBFORM_ANTIBOT_DISABLED_WEBFORM', 2);
+
+/**
+ * Flag to indicate that antibot is enabled for all webforms.
+ */
+define('WEBFORM_ANTIBOT_ENABLED_WEBFORM', 3);
+
+/**
+ * Alter webform third party settings webforms to include Antibot configuration.
+ *
+ * @param array $form
+ *   An associative array containing the structure of the form.
+ * @param \Drupal\Core\Form\FormStateInterface $form_state
+ *   The current state of the form.
+ * @param bool $antibot
+ *   TRUE if antibot protection is enabled.
+ * @param int $antibot_state
+ *   Flag that determines if antibot protection is enabled, disabled, or can be
+ *   set.
+ * @param string|\Drupal\Core\StringTranslation\TranslatableMarkup $label
+ *   The label to displayed within the checkbox titles.
+ */
+function _webform_antibot_form(array &$form, FormStateInterface $form_state, $antibot, $antibot_state, $label) {
+  $t_args = [
+    '%label' => $label,
+    ':href_antibot' => Url::fromRoute('antibot.settings')->toString(),
+    ':href_webform' => Url::fromRoute('webform.config')->toString(),
+  ];
+
+  // Antibot.
+  $form['third_party_settings']['antibot'] = [
+    '#type' => 'details',
+    '#title' => t('Antibot'),
+    '#open' => TRUE,
+    '#description' => t('Prevent SPAM webform submissions from being submitted without JavaScript enabled using the <a href=":href_antibot">antibot</a> method.', $t_args),
+  ];
+  $form['third_party_settings']['antibot']['antibot'] = [
+    '#type' => 'checkbox',
+    '#title' => t('Protect %label with Antibot', $t_args),
+    '#default_value' => $antibot,
+    '#return_value' => TRUE,
+  ];
+
+  if ($antibot_state != WEBFORM_ANTIBOT_NEUTRAL) {
+    $form['third_party_settings']['antibot']['antibot']['#attributes']['disabled'] = 'disabled';
+    $form_state->set('antibot_disabled', TRUE);
+    if ($antibot_state == WEBFORM_ANTIBOT_ENABLED_WEBFORM) {
+      $form['third_party_settings']['antibot']['antibot']['#default_value'] = 1;
+      $form['third_party_settings']['antibot']['antibot']['#description'] = t('<a href=":href_webform">Antibot protection</a> is enabled for all webforms.', $t_args);
+    }
+  }
+
+  $form['#validate'][] = '_webform_antibot_form_validate';
+
+}
+
+/**
+ * Validate callback; Checks if antibot is disabled and remove it from the third party settings values.
+ */
+function _webform_antibot_form_validate(&$form, FormStateInterface $form_state) {
+  $third_party_settings = $form_state->getValue('third_party_settings');
+  if ($form_state->get('antibot_disabled') || empty($third_party_settings['antibot']['antibot'])) {
+    unset($third_party_settings['antibot']['antibot']);
+  }
+  if (empty($third_party_settings['antibot'])) {
+    unset($third_party_settings['antibot']);
+  }
+  $form_state->setValue('third_party_settings', $third_party_settings);
+}
+
+/**
+ * Implements hook_webform_admin_third_party_settings_form_alter().
+ */
+function antibot_webform_admin_third_party_settings_form_alter(&$form, FormStateInterface $form_state) {
+  /** @var \Drupal\webform\WebformThirdPartySettingsManagerInterface $third_party_settings_manager */
+  $third_party_settings_manager = \Drupal::service('webform.third_party_settings_manager');
+
+  $antibot = $third_party_settings_manager->getThirdPartySetting('antibot', 'antibot');
+  $antibot_state = WEBFORM_ANTIBOT_NEUTRAL;
+
+  _webform_antibot_form(
+    $form,
+    $form_state,
+    $antibot,
+    $antibot_state,
+    t('all webforms')
+  );
+}
+
+/**
+ * Implements hook_webform_third_party_settings_form_alter().
+ */
+function antibot_webform_third_party_settings_form_alter(&$form, FormStateInterface $form_state) {
+  /** @var \Drupal\webform\WebformThirdPartySettingsManagerInterface $third_party_settings_manager */
+  $third_party_settings_manager = \Drupal::service('webform.third_party_settings_manager');
+
+  /** @var \Drupal\webform\WebformInterface $webform */
+  $webform = $form_state->getFormObject()->getEntity();
+
+  $antibot = $webform->getThirdPartySetting('antibot', 'antibot');
+  if ($third_party_settings_manager->getThirdPartySetting('antibot', 'antibot')) {
+    $antibot_state = WEBFORM_ANTIBOT_ENABLED_WEBFORM;
+  }
+  else {
+    $antibot_state = WEBFORM_ANTIBOT_NEUTRAL;
+  }
+
+  _webform_antibot_form(
+    $form,
+    $form_state,
+    $antibot,
+    $antibot_state,
+    t('@label webform', ['@label' => $webform->label()])
+  );
+}
+
+/**
+ * Implements hook_webform_submission_form_alter().
+ */
+function antibot_webform_submission_form_alter(&$form, FormStateInterface $form_state, $form_id) {
+  // Only add an Antibot when a webform is initially load.
+  // After a webform is submitted, via a multi-step webform and/or saving a draft,
+  // we can skip adding an Antibot.
+  if ($form_state->isSubmitted()) {
+    return;
+  }
+
+  /** @var \Drupal\webform\WebformThirdPartySettingsManagerInterface $third_party_settings_manager */
+  $third_party_settings_manager = \Drupal::service('webform.third_party_settings_manager');
+
+  /** @var \Drupal\webform\WebformSubmissionInterface $webform_submission */
+  $webform_submission = $form_state->getFormObject()->getEntity();
+  $webform = $webform_submission->getWebform();
+
+  $antibot = $third_party_settings_manager->getThirdPartySetting('antibot', 'antibot') ?:
+    $webform->getThirdPartySetting('antibot', 'antibot');
+  if ($antibot) {
+    if (function_exists('antibot_protect_form')) {
+      // Applies to antibot-8.x-1.2+
+      // Set #form_id which is needed by antibot_protect_form().
+      $form['#form_id'] = $form_id;
+      antibot_protect_form($form);
+    }
+    else {
+      // Applies to antibot-8.x-1.1 and below.
+      // @todo Remove backward compatibility for antibot-8.x-1.1.
+      $form['#pre_render'][] = 'antibot_form_pre_render';
+    }
+  }
+
+}

web/modules/contrib/webform/third_party_settings/webform.honeypot.inc

@@ -57,7 +57,7 @@ function _webform_honeypot_form(array &$form, FormStateInterface $form_state, $h
   $t_args = [
     '%label' => $label,
     ':href_honeypot' => Url::fromRoute('honeypot.config')->toString(),
-    ':href_webform' => Url::fromRoute('webform.settings')->toString(),
+    ':href_webform' => Url::fromRoute('webform.config')->toString(),
   ];
 
   // Honeypot.
@@ -71,6 +71,7 @@ function _webform_honeypot_form(array &$form, FormStateInterface $form_state, $h
     '#type' => 'checkbox',
     '#title' => t('Protect %label with Honeypot', $t_args),
     '#default_value' => $honeypot,
+    '#return_value' => TRUE,
   ];
 
   if ($honeypot_state != WEBFORM_HONEYPOT_NEUTRAL) {
@@ -91,6 +92,7 @@ function _webform_honeypot_form(array &$form, FormStateInterface $form_state, $h
     '#type' => 'checkbox',
     '#title' => t('Add time restriction to %label', $t_args),
     '#default_value' => $time_restriction,
+    '#return_value' => TRUE,
   ];
 
   if ($time_restriction_state != WEBFORM_HONEYPOT_NEUTRAL) {
@@ -115,19 +117,22 @@ function _webform_honeypot_form(array &$form, FormStateInterface $form_state, $h
  */
 function _webform_honeypot_form_validate(&$form, FormStateInterface $form_state) {
   $third_party_settings = $form_state->getValue('third_party_settings');
-  if ($form_state->get('honeypot_disabled')) {
+  if ($form_state->get('honeypot_disabled') || empty($third_party_settings['honeypot']['honeypot'])) {
     unset($third_party_settings['honeypot']['honeypot']);
   }
-  if ($form_state->get('time_restriction_disabled')) {
+  if ($form_state->get('time_restriction_disabled') || empty($third_party_settings['honeypot']['time_restriction'])) {
     unset($third_party_settings['honeypot']['time_restriction']);
   }
+  if (empty($third_party_settings['honeypot'])) {
+    unset($third_party_settings['honeypot']);
+  }
   $form_state->setValue('third_party_settings', $third_party_settings);
 }
 
 /**
- * Implements hook_form_FORM_ID_alter().
+ * Implements hook_webform_admin_third_party_settings_form_alter().
  */
-function honeypot_form_webform_admin_third_party_settings_form_alter(&$form, FormStateInterface $form_state) {
+function honeypot_webform_admin_third_party_settings_form_alter(&$form, FormStateInterface $form_state) {
   /** @var \Drupal\webform\WebformThirdPartySettingsManagerInterface $third_party_settings_manager */
   $third_party_settings_manager = \Drupal::service('webform.third_party_settings_manager');
 
@@ -149,9 +154,9 @@ function honeypot_form_webform_admin_third_party_settings_form_alter(&$form, For
 }
 
 /**
- * Implements hook_form_FORM_ID_alter().
+ * Implements hook_webform_third_party_settings_form_alter().
  */
-function honeypot_form_webform_third_party_settings_form_alter(&$form, FormStateInterface $form_state) {
+function honeypot_webform_third_party_settings_form_alter(&$form, FormStateInterface $form_state) {
   /** @var \Drupal\webform\WebformThirdPartySettingsManagerInterface $third_party_settings_manager */
   $third_party_settings_manager = \Drupal::service('webform.third_party_settings_manager');
 
@@ -196,7 +201,7 @@ function honeypot_form_webform_third_party_settings_form_alter(&$form, FormState
  */
 function honeypot_webform_submission_form_alter(&$form, FormStateInterface $form_state, $form_id) {
   // Only add a Honeypot when a webform is initially load.
-  // After a webform is submitted, via a multistep webform and/or saving a draft,
+  // After a webform is submitted, via a multi-step webform and/or saving a draft,
   // we can skip adding a Honeypot.
   if ($form_state->isSubmitted()) {
     return;

web/modules/contrib/webform/third_party_settings/webform.maillog.inc

@@ -0,0 +1,79 @@
+<?php
+
+/**
+ * @file
+ * Integrates third party settings on the Maillog module's behalf.
+ */
+
+use Drupal\Core\EventSubscriber\MainContentViewSubscriber;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Url;
+use Drupal\webform\Entity\Webform;
+use Drupal\webform\Plugin\WebformHandler\EmailWebformHandler;
+
+/**
+ * Implements hook_webform_submission_form_alter().
+ */
+function maillog_webform_submission_form_alter(array &$form, FormStateInterface $form_state, $form_id) {
+  // Never display Maillog message via CLI.
+  if (PHP_SAPI == 'cli') {
+    return;
+  }
+
+  // Never display Maillog message via dialogs or Ajax requests.
+  $wrapper_format = \Drupal::request()->get(MainContentViewSubscriber::WRAPPER_FORMAT);
+  if ($wrapper_format) {
+    return;
+  }
+
+  $config = \Drupal::config('maillog.settings');
+
+  // Only display warning if emails are not being sent.
+  if ($config->get('send')) {
+    return;
+  }
+
+  // If this webform does not send any email do not display any warning.
+  $webform = Webform::load($form['#webform_id']);
+  $sends_email = FALSE;
+  $handlers = $webform->getHandlers();
+  foreach ($handlers as $handler) {
+    if ($handler instanceof EmailWebformHandler) {
+      $sends_email = TRUE;
+    }
+  }
+  if (!$sends_email) {
+    return;
+  }
+
+  // Build warning message base on maillog settings and permissions.
+  $build = [];
+
+  // Display warning that all emails will be logged to admins only.
+  // Display warning that all emails will be logged to admins only.
+  if (\Drupal::currentUser()->hasPermission('administer maillog')) {
+    $t_args = [':href' => Url::fromRoute('maillog.settings')->toString()];
+    if ($config->get('log')) {
+      $build[] = ['#markup' => t('The <a href=":href">Maillog</a> module is logging all emails.', $t_args)];
+    }
+    else {
+      $build[] = ['#markup' => t('The <a href=":href">Maillog</a> module is installed.', $t_args)];
+    }
+  }
+
+  // Display warning if the user can view email on page.
+  if (\Drupal::currentUser()->hasPermission('view maillog') && $config->get('verbose')) {
+    $build[] = ['#prefix' => ' ', '#markup' => t('Emails will displayed on this page.')];
+  }
+
+  // Display warning if no emails are being sent.
+  $build[] = [
+    '#markup' => t('No emails will be sent.'),
+    '#prefix' => ' <b>',
+    '#suffix' => '</b>',
+  ];
+
+  if ($build) {
+    \Drupal::messenger()->addWarning(\Drupal::service('renderer')->renderPlain($build));
+  }
+}