Fix. After test. Ignoring other parts of title fixed.

Author: alexandergull

lib/Cleantalk/Antispam/EmailEncoder/EmailEncoder.php

@@ -190,10 +190,6 @@ public function modifyContent($content)
             return $content;
         }
 
-        if ($this->shortcodes->exclude->isContentExcluded($content)) {
-            return $content;
-        }
-
         // modify content to prevent aria-label replaces by hiding it
         $content = $this->handleAriaLabelContent($content);
 

lib/Cleantalk/Antispam/EmailEncoder/Shortcodes/SkipContentFromEncodeSC.php

@@ -18,7 +18,8 @@ class SkipContentFromEncodeSC extends EmailEncoderShortCode
     /**
      * @var string The wrapper used to mark content for exclusion.
      */
-    private $exclusion_wrapper = '%%APBCT_SHORT_CODE_EXCLUDE_EE%%';
+    private $exclusion_wrapper = '##SCE_%d##';
+    private $replaces = array();
 
     /**
      * Callback function for the shortcode.
@@ -32,9 +33,7 @@ class SkipContentFromEncodeSC extends EmailEncoderShortCode
      */
     public function callback($_atts, $content, $_tag)
     {
-        $wrapper = $this->exclusion_wrapper;
-        $content = $wrapper . $content . $wrapper;
-        return $content;
+        return $this->processExclusions($content);
     }
 
     /**
@@ -64,28 +63,47 @@ public function changeContentBeforeEncoderModify($content)
      */
     public function changeContentAfterEncoderModify($content)
     {
-        $content = str_replace(
-            $this->exclusion_wrapper,
-            '',
-            $content
-        );
-        return $content;
+        return $this->revertExclusions($content);
     }
 
     /**
-     * Checks if the content is excluded from encoding.
+     * Apply exclusions to replace modified shortcodes with service symbols. Then collect all the performed
+     * replacements to memory storage to being reverted after common modifying.
      *
-     * Uses a regular expression to determine if the content is wrapped
-     * in the exclusion wrapper.
-     *
-     * @param string $content The content to check.
-     * @return false|int Returns 1 if the content is excluded, 0 otherwise.
+     * @param string|null $content The content to check.
+     * @return string Returns content with handled exclusions
      * @psalm-suppress PossiblyUnusedMethod
      */
-    public function isContentExcluded($content)
+    public function processExclusions($content)
+    {
+        if (is_null($content)) {
+            return (string)$content;
+        }
+        $index = count($this->replaces);
+        $placeholder = sprintf($this->exclusion_wrapper, $index);
+        $this->replaces[$index] = [
+            'origin' => $content,
+            'replace' => $placeholder
+        ];
+        $wrappedContent = $placeholder;
+
+        return $wrappedContent;
+    }
+
+    /**
+     * Rollback al the replaces with modified shortcodes after common encoding.
+     * @param string $content
+     *
+     * @return string
+     */
+    public function revertExclusions($content)
     {
-        $exclusion_regex = '/' . $this->exclusion_wrapper . '.*' . $this->exclusion_wrapper . '/';
-        return preg_match($exclusion_regex, $content);
+        foreach ($this->replaces as $_item => $data) {
+            if (isset($data['replace'], $data['origin']) && is_string($data['replace']) && is_string($data['origin'])) {
+                $content = str_replace($data['replace'], $data['origin'], $content);
+            }
+        }
+        return $content;
     }
 
     /**

tests/Antispam/testEmailEnocderShortcodeSkip.php

@@ -22,46 +22,46 @@ public function testCallbackWrapsContentInExclusionWrapper()
         $content = 'Test content';
         $result = $this->shortcode->callback([], $content, 'apbct_skip_encoding');
 
-        $this->assertEquals('%%APBCT_SHORT_CODE_EXCLUDE_EE%%Test content%%APBCT_SHORT_CODE_EXCLUDE_EE%%', $result);
+        $this->assertEquals('##SCE_0##', $result);
     }
 
     public function testChangeContentBeforeEncoderModifyExecutesCallback()
     {
         $content = 'Some content with [apbct_skip_encoding]Test content[/apbct_skip_encoding]';
         $result = $this->shortcode->changeContentBeforeEncoderModify($content);
 
-        $this->assertStringContainsString('%%APBCT_SHORT_CODE_EXCLUDE_EE%%Test content%%APBCT_SHORT_CODE_EXCLUDE_EE%%', $result);
+        $this->assertStringContainsString('Some content with ##SCE_0##', $result);
     }
 
-    public function testChangeContentAfterEncoderModifyRemovesExclusionWrapper()
-    {
-        $content = '%%APBCT_SHORT_CODE_EXCLUDE_EE%%Test content%%APBCT_SHORT_CODE_EXCLUDE_EE%%';
-        $result = $this->shortcode->changeContentAfterEncoderModify($content);
-
-        $this->assertEquals('Test content', $result);
-    }
-
-    public function testIsContentExcludedReturnsTrueForExcludedContent()
+    public function testClearTitleContentFromShortcodeConstruction()
     {
-        $content = '%%APBCT_SHORT_CODE_EXCLUDE_EE%%Test content%%APBCT_SHORT_CODE_EXCLUDE_EE%%';
-        $result = $this->shortcode->isContentExcluded($content);
+        $content = 'Some content with [apbct_skip_encoding]Test content[/apbct_skip_encoding]';
+        $result = $this->shortcode->clearTitleContentFromShortcodeConstruction($content);
 
-        $this->assertEquals(1, $result);
+        $this->assertEquals('Some content with Test content', $result);
     }
 
-    public function testIsContentExcludedReturnsFalseForNonExcludedContent()
+    public function testClearTitleContentFromShortcodeConstructionSkippingEmail()
     {
-        $content = 'Test content';
-        $result = $this->shortcode->isContentExcluded($content);
+        $content = 'Hah, there is email example@exmple.com and some content with [apbct_skip_encoding]Test content[/apbct_skip_encoding]';
+        $result = $this->shortcode->clearTitleContentFromShortcodeConstruction($content);
 
-        $this->assertEquals(0, $result);
+        $this->assertEquals('Hah, there is email example@exmple.com and some content with Test content', $result);
     }
 
-    public function testClearTitleContentFromShortcodeConstruction()
+    public function testTitleContentWithEmailSkippedAndUnskipped()
     {
-        $content = 'Some content with [apbct_skip_encoding]Test content[/apbct_skip_encoding]';
-        $result = $this->shortcode->clearTitleContentFromShortcodeConstruction($content);
-
-        $this->assertEquals('Some content with Test content', $result);
+        $origin_content = 'Hah, there is email example@exmple.com and some content with [apbct_skip_encoding]Test content[/apbct_skip_encoding]';
+        $content = $origin_content;
+        //emulate hook before
+        $content = $this->shortcode->changeContentBeforeEncoderModify($content);
+        //do common modifying
+        $content = \Cleantalk\ApbctWP\Antispam\EmailEncoder::getInstance()->modifyContent($content);
+        //emulate hook after
+        $content = $this->shortcode->changeContentAfterEncoderModify($content);
+
+        $this->assertStringNotContainsString( 'example@exmple.com', $content);
+        $this->assertStringNotContainsString( 'apbct_skip_encoding', $content);
+        $this->assertStringContainsString( 'with Test content', $content);
     }
 }