refactor: remove url encoding for guzzle uri implementation

networkteam · Aug 12, 2024 · bdc511a · bdc511a
1 parent a9e742b
commit bdc511a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/Classes/Converter/Mailto2HrefObfuscatingConverter.php b/Classes/Converter/Mailto2HrefObfuscatingConverter.php
@@ -58,9 +58,6 @@ public function convert($mailAddress)
      */
     protected function encryptEmail(string $string, int $randomOffset): string
     {
-        // Decode HTML entities to ensure & is not encoded as &amp;
-        $string = html_entity_decode($string, ENT_QUOTES | ENT_HTML5);
-
         $out = '';
         // like str_rot13() but with a variable offset and a wider character range
         $len = strlen($string);

diff --git a/Classes/Fusion/ConvertEmailLinksImplementation.php b/Classes/Fusion/ConvertEmailLinksImplementation.php
@@ -119,9 +119,10 @@ public function convertLinkName(array $matches)
      */
     public function convertMailLink($matches)
     {
-        $email = trim($matches[2]);
+        $email = html_entity_decode(trim($matches[2]), ENT_QUOTES | ENT_HTML5);
         $replacedHrefContent = $this->mailToHrefConverter->convert($email);
 
-        return $matches[1] . htmlspecialchars($replacedHrefContent);
+        $uri = new \GuzzleHttp\Psr7\Uri($replacedHrefContent);
+        return $matches[1] . (string)$uri;
     }
 }