Merge pull request #1492 from cypht-org/strip_dns_prefetch_tags

feat(other): add strip_dns_prefetch_tags for the html

Author: kroky

modules/core/message_functions.php

@@ -75,6 +75,17 @@ function format_msg_text($str, $output_mod, $links=true) {
     return preg_replace("/^(&gt;.*<br \/>)/m", "<span class=\"reply_quote\">$1</span>", $str);
 }}
 
+/**
+ * Strip DNS prefetch tags from HTML
+ * @subpackage core/functions
+ * @param string $html HTML content
+ * @return string
+ */
+if (!hm_exists('strip_dns_prefetch_tags')) {
+function strip_dns_prefetch_tags($html) {
+    return preg_replace('/<link\s+[^>]*rel=["\']dns-prefetch["\'][^>]*>/i', '', $html);
+}}
+
 /**
  * Format reply text
  * @subpackage core/functions
@@ -119,7 +130,7 @@ function reply_to_address($headers, $type) {
         return $msg_to;
     }
     foreach (array('reply-to', 'from', 'sender', 'return-path') as $fld) {
-        if (array_key_exists($fld, $headers)) { 
+        if (array_key_exists($fld, $headers)) {
             list($parsed, $msg_to) = format_reply_address($headers[$fld], $parsed);
             if ($msg_to) {
                 break;
@@ -485,7 +496,7 @@ function addr_split($str, $seps = array(',', ';')) {
         elseif (!$capture && in_array($str[$i], array_keys($capture_chars))) {
             $capture = $str[$i];
         }
-        
+
         if (!$capture && in_array($str[$i], $seps)) {
             $words[] = trim($word);
             $word = '';

modules/imap/output_modules.php

@@ -124,6 +124,7 @@ protected function output() {
                     $txt .= format_msg_text($this->get('msg_text'), $this);
                 }
             }
+            $msg_text = strip_dns_prefetch_tags('msg_text');
         }
         $txt .= '</div>';
         $this->out('msg_text', $txt);
@@ -229,7 +230,7 @@ protected function output() {
             if ($this->get('list_headers')) {
                 $txt .= format_list_headers($this);
             }
-            $lc_headers = lc_headers($headers); 
+            $lc_headers = lc_headers($headers);
             if (array_key_exists('to', $lc_headers)) {
                 $addr_list = process_address_fld($lc_headers['to']);
                 $size = count($addr_list);
@@ -247,7 +248,7 @@ protected function output() {
                 });
                 $size += count($addr_list);
             }
-            
+
             $txt .= '<tr><td class="header_space" colspan="2"></td></tr>';
             $txt .= '<tr><th colspan="2" class="header_links">';
             $txt .= '<div class="msg_move_to">'.
@@ -386,7 +387,7 @@ protected function output() {
                 $default_value = '';
                 if (isset($vals['sieve_config_host'])) {
                     $default_value = $vals['sieve_config_host'];
-                
+
                     $res .=  '<span><label class="screen_reader" for="imap_sieve_host_'.$index.'">'.$this->trans('Sieve Host').'</label>'.
                             '<input '.$disabled.' id="imap_sieve_host_'.$index.'" class="credentials imap_sieve_host_input" placeholder="Sieve Host" type="text" name="imap_sieve_host" value="'.$default_value.'"></span>';
                 }