Changeset 5769 in subversion

Timestamp:

Jan 13, 2012 6:21:45 AM (17 months ago)

Author:

alec

Message:

• Make mime type detection based on filename extension to be case-insensitive

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• program/include/main.inc (modified) (1 diff)
• program/include/rcube_shared.inc (modified) (2 diffs)

trunk/roundcubemail/CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Make mime type detection based on filename extension to be case-insensitive
 - Fix failure on MySQL database upgrade from 0.7 - text column can't have default value (#1488300)
 - Added address book widget on compose screen

trunk/roundcubemail/program/include/main.inc

@@ -1628 +1628 @@
 
   $classes = array($primary ? $primary : 'unknown');
-  if ($secondary)
+  if ($secondary) {
     $classes[] = $secondary;
-  if (preg_match('/\.([a-z0-9]+)$/', $filename, $m))
+  }
+  if (preg_match('/\.([a-z0-9]+)$/i', $filename, $m)) {
     $classes[] = $m[1];
-
-  return join(" ", $classes);
+  }
+
+  return strtolower(join(" ", $classes));
 }
 

trunk/roundcubemail/program/include/rcube_shared.inc

@@ -363 +363 @@
     $mime_magic = rcmail::get_instance()->config->get('mime_magic');
     $mime_ext = @include(RCMAIL_CONFIG_DIR . '/mimetypes.php');
-    $suffix = $name ? substr($name, strrpos($name, '.')+1) : '*';
 
     // use file name suffix with hard-coded mime-type map
-    if (is_array($mime_ext)) {
-        $mime_type = $mime_ext[$suffix];
-    }
+    if (is_array($mime_ext) && $name) {
+        if ($suffix = substr($name, strrpos($name, '.')+1)) {
+            $mime_type = $mime_ext[strtolower($suffix)];
+        }
+    }
+
     // try fileinfo extension if available
     if (!$mime_type && function_exists('finfo_open')) {
@@ -379 +381 @@
         }
     }
+
     // try PHP's mime_content_type
     if (!$mime_type && !$is_stream && function_exists('mime_content_type')) {
       $mime_type = @mime_content_type($path);
     }
+
     // fall back to user-submitted string
     if (!$mime_type) {