Commit 3cfeaafd authored by Sascha Grossenbacher's avatar Sascha Grossenbacher
Browse files

Revert "Issue #2566277 by giancarlosotelo: Don't rely on devel module for printing mail content" 

This reverts commit 2d427000.
parent 2d427000

README.txt

+2 −2
Original line number Diff line number Diff line 


This module defines drupal_mail_wrapper(), which takes over the handling of mail sending. This wrapper creates a node of type 'Logged Mail', a node type created by the module, sends the e-mail, and displays the e-mail and its details. All 3 tasks can be enabled/disabled from 'admin/settings/maillog'.

This module defines drupal_mail_wrapper(), which takes over the handling of mail sending. This wrapper creates a node of type 'Logged Mail', a node type created by the module, sends the e-mail, and displays the e-mail and its details by using devel module API. All 3 tasks can be enabled/disabled from 'admin/settings/maillog'.



The invoking of the handler depends on a system variable 'smtp_library'. Unfortunately, some modules may change the value of this variable, rendering the module dysfunctional. Simply disabling and re-enabling the module should fix this problem. Check 'admin/reports/status' to see the status of the SMTP library.
 
 No newline at end of file

config/install/maillog.settings.yml

+1 −1
Original line number Diff line number Diff line 
send: true

log: true

verbose: true
 
devel: true
 
 No newline at end of file

config/schema/maillog.schema.yml

+2 −2
Original line number Diff line number Diff line
@@ -7,6 +7,6 @@ maillog.settings: 
    log:

      type: boolean

      label: Log emails

    verbose:

    devel:

      type: boolean

      label: Display mails
 
      label: Display mails using devel

maillog.permissions.yml

+1 −2
Original line number Diff line number Diff line 
view maillog:

  title: 'View Maillog'

  description: 'Allow users to view messages when being sent and all previously sent and logged mails.'

  restrict access: true

  description: 'Allow users to view a list of recently logged mails.'

delete maillog:

  title: 'Delete entries from the log'

  description: 'Allow users to delete logged mails.'

src/Form/MaillogSettingsForm.php

+7 −10
Original line number Diff line number Diff line
@@ -49,11 +49,10 @@ class MaillogSettingsForm extends ConfigFormBase { 
      '#default_value' => $config->get('log'),

    );



    $form['maillog_verbose'] = array(

    $form['maillog_devel'] = array(

      '#type' => 'checkbox',

      '#title' => t("Display the e-mails on page."),

      '#default_value' => $config->get('verbose'),

      '#description' => $this->t('If enabled, anonymous users with permissions will see any verbose output mail.'),

      '#title' => t("Display the e-mails on page using devel module (if enabled)."),

      '#default_value' => $config->get('devel'),

    );



    /*if (\Drupal::moduleHandler()->moduleExists('mimemail')) {
@@ -75,16 +74,14 @@ class MaillogSettingsForm extends ConfigFormBase { 
   * {@inheritdoc}

   */

  public function submitForm(array &$form, FormStateInterface $form_state) {

    $this->config('maillog.settings')

    $config = $this->config('maillog.settings')

      ->set('send', $form_state->getValue('maillog_send'))

      ->set('log', $form_state->getValue('maillog_log'))

      ->set('verbose', $form_state->getValue('maillog_verbose'))->save();

      ->set('devel', $form_state->getValue('maillog_devel'));



    parent::submitForm($form, $form_state);

    $config->save();



    if ($this->config('maillog.settings')->get('verbose') == TRUE) {

      drupal_set_message(t('Any user having the permission "view maillog" will see output of any mail that is sent.'), 'warning');

    }

    parent::submitForm($form, $form_state);

  }



}