Roundcubemail devel
parent: e3379e05 | patch | commit | show whitespace
thomascube
2008-12-01 ffbf910df93d0a29fc8ea5a6fb0fa39e078fa77e 
Insert meta content-type at top of the html head + add both content-id and content-location of related parts to replacement table

2 files modified
12 ■■■■■ changed files
program/include/rcube_message.php 10 ●●●●● patch | view | raw | blame | history
program/steps/mail/func.inc 2 ●●●●● patch | view | raw | blame | history 
 program/include/rcube_message.php


@@ -374,13 +374,13 @@


          if ($message_ctype_secondary == 'appledouble' && $secondary_type == 'applefile')


            continue;




          // part belongs to a related message


          if ($message_ctype_secondary == 'related' && $mail_part->headers['content-id']) {


          if ($message_ctype_secondary == 'related' && $mail_part->headers['content-id'])


            $mail_part->content_id = preg_replace(array('/^</', '/>$/'), '', $mail_part->headers['content-id']);


            $this->inline_parts[] = $mail_part;


          }


          else if ($message_ctype_secondary == 'related' && $mail_part->headers['content-location']) {


          if ($message_ctype_secondary == 'related' && $mail_part->headers['content-location'])


            $mail_part->content_location = $mail_part->headers['content-base'] . $mail_part->headers['content-location'];


            


          // part belongs to a related message


          if ($mail_part->content_id || $mail_part->content_location) {


            $this->inline_parts[] = $mail_part;


          }


          // is regular attachment




 program/steps/mail/func.inc


@@ -649,7 +649,7 @@


      // add head for malformed messages, washtml cannot work without that


      if (!preg_match('/<head[^>]*>(.*)<\/head>/Uims', $html))


        $html = '<head></head>'. $html;


      $html = substr_replace($html, '<meta http-equiv="Content-Type" content="text/html; charset='.RCMAIL_CHARSET.'" />', intval(stripos($html, '</head>')), 0);


      $html = substr_replace($html, '<meta http-equiv="content-type" content="text/html; charset='.RCMAIL_CHARSET.'" />', intval(stripos($html, '<head>')+6), 0);


    }




    // clean HTML with washhtml by Frederic Motte