Commit 5d802c6d authored by Bryan Sharpe's avatar Bryan Sharpe
Browse files

Issue #3314887 by b_sharpe: code cleanup post-move of rot13.

parent b0bb5976

README.md

+2 −3
Original line number Diff line number Diff line
@@ -57,4 +57,3 @@ In the backend go to `admin/config/content/formats`, e.g. Basic HTML, and under 
the section "Enabled filters" check the box "Obfuscate Email". So now every

mailto-anchor written in the ckeditor will be preprocessed before rendering and

substituted on the client side.

modules/rot13/src/Twig/Rot13Extension.php

+2 −2
Original line number Diff line number Diff line
@@ -18,9 +18,9 @@ class Rot13Extension extends AbstractExtension { 
   * {@inheritdoc}

   */

  public function getFilters() {

    return array(

    return [

      new TwigFilter('rot13', 'str_rot13'),

    );

    ];

  }



  /**

src/Plugin/Filter/ObfuscateEmail.php

+6 −5
Original line number Diff line number Diff line
@@ -3,12 +3,12 @@ 
namespace Drupal\obfuscate_email\Plugin\Filter;



use Drupal\Component\Utility\Html;

use Drupal\Core\Form\FormStateInterface;

use Drupal\filter\FilterProcessResult;

use Drupal\filter\Plugin\FilterBase;

use Drupal\Core\Form\FormStateInterface;



/**

 * Provide a filter to obfuscate mailto anchor tags and optionally replace inner text.

 * Provide a filter to obfuscate mailto anchors and replace inner text.

 *

 * @Filter(

 *   id = "obfuscate_email",
@@ -40,7 +40,7 @@ class ObfuscateEmail extends FilterBase { 
      '#default_value' => $this->settings['click_label'],

      '#states' => [

        'visible' => [

          ':input[name="filters[obfuscate_email][settings][click]"]' => array('checked' => TRUE),

          ':input[name="filters[obfuscate_email][settings][click]"]' => ['checked' => TRUE],

        ],

      ],

    ];
@@ -69,7 +69,7 @@ class ObfuscateEmail extends FilterBase { 
      if ($href) {

        $domElement->setAttribute('href', '#');



        // Convert to rot13

        // Convert to rot13.

        $mail_string = str_rot13(str_replace(['.', '@'], ['/dot/', '/at/'], $href));

        $domElement->setAttribute('data-mail-to', $mail_string);
@@ -79,7 +79,8 @@ class ObfuscateEmail extends FilterBase { 
          $domElement->setAttribute('data-replace-inner', '@email');



          if ($this->settings['click']) {

            $domElement->setAttribute('data-mail-click-link', true);

            $domElement->setAttribute('data-mail-click-link', TRUE);

            //phpcs:ignore.

            $domElement->nodeValue = $this->t($this->settings['click_label']);

            $domElement->setAttribute('data-replace-inner', $domElement->nodeValue);

          }

src/Twig/Rot13Extension.php

+2 −2
Original line number Diff line number Diff line
@@ -18,9 +18,9 @@ class Rot13Extension extends AbstractExtension { 
   * {@inheritdoc}

   */

  public function getFilters() {

    return array(

    return [

      new TwigFilter('rot13', 'str_rot13'),

    );

    ];

  }



  /**