diff options
author | Aleksander Machniak <alec@alec.pl> | 2013-05-28 20:59:44 +0200 |
---|---|---|
committer | Aleksander Machniak <alec@alec.pl> | 2013-05-28 20:59:44 +0200 |
commit | fe0f1d589b2320905fa3dd73737d5b7b1cbc402a (patch) | |
tree | f350019cd9446e2f1651047f2d120f12a939e9f3 /program | |
parent | b91bc101a0a3c8227b225ce557954f6a1e654ed3 (diff) |
Improve rcube_utils::file2class() to not return duplicates
Diffstat (limited to 'program')
-rw-r--r-- | program/lib/Roundcube/rcube_utils.php | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/program/lib/Roundcube/rcube_utils.php b/program/lib/Roundcube/rcube_utils.php index 8467107fe..23f24a46a 100644 --- a/program/lib/Roundcube/rcube_utils.php +++ b/program/lib/Roundcube/rcube_utils.php @@ -510,17 +510,24 @@ class rcube_utils */ public static function file2class($mimetype, $filename) { + $mimetype = strtolower($mimetype); + $filename = strtolower($filename); + list($primary, $secondary) = explode('/', $mimetype); $classes = array($primary ? $primary : 'unknown'); + if ($secondary) { $classes[] = $secondary; } - if (preg_match('/\.([a-z0-9]+)$/i', $filename, $m)) { - $classes[] = $m[1]; + + if (preg_match('/\.([a-z0-9]+)$/', $filename, $m)) { + if (!in_array($m[1], $classes)) { + $classes[] = $m[1]; + } } - return strtolower(join(" ", $classes)); + return join(" ", $classes); } |