Changeset 4114 in subversion

Timestamp:

Oct 20, 2010 7:27:39 AM (3 years ago)

Author:

alec

Message:

• Fix content-type name regexp according to RFC4288.4.2

File:

• trunk/roundcubemail/program/include/rcube_message.php (modified) (5 diffs)

trunk/roundcubemail/program/include/rcube_message.php

@@ -46 +46 @@
     private $inline_parts = array();
     private $parse_alternative = false;
-  
+
     public $uid = null;
     public $headers;
@@ -56 +56 @@
     public $sender = null;
     public $is_safe = false;
-  
+
 
     /**
@@ -106 +106 @@
         $this->app->plugins->exec_hook('message_load', array('object' => $this));
     }
-  
-  
+
+
     /**
      * Return a (decoded) message header
@@ -125 +125 @@
     }
 
-  
+
     /**
      * Set is_safe var and session data
@@ -469 +469 @@
                         $this->parse_structure($mail_part, true);
                     }
-                    // is a regular attachment
-                    else if (preg_match('!^[a-z0-9-.+_]+/[a-z0-9-.+_]+$!i', $part_mimetype)) {
+                    // is a regular attachment (content-type name regexp according to RFC4288.4.2)
+                    else if (preg_match('/^[a-z0-9!#$&.+^_-]+\/[a-z0-9!#$&.+^_-]+$/i', $part_mimetype)) {
                         if (!$mail_part->filename)
                             $mail_part->filename = 'Part '.$mail_part->mime_id;