Browse files

MDL-35141 Filelib: No icon for epub filetype

  • Loading branch information...
1 parent bac15e5 commit d6d63941d7e5f2ebcf9e8714a692884d52badac3 @sammarshallou sammarshallou committed Aug 30, 2012
Showing with 10 additions and 4 deletions.
  1. +1 −0 lang/en/mimetypes.php
  2. +9 −4 lib/filelib.php
  3. BIN pix/f/epub.png
View
1 lang/en/mimetypes.php
@@ -46,6 +46,7 @@
$string['application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'] = 'Excel spreadsheet';
$string['application/vnd.openxmlformats-officedocument.spreadsheetml.template'] = 'Excel template';
$string['application/vnd.openxmlformats-officedocument.wordprocessingml.document'] = 'Word document';
+$string['application/epub_zip'] = 'EPUB ebook';
$string['archive'] = 'Archive ({$a->EXT})';
$string['audio'] = 'Audio file ({$a->EXT})';
$string['default'] = '{$a->mimetype}';
View
13 lib/filelib.php
@@ -1406,6 +1406,7 @@ function &get_mimetypes_array() {
'dir' => array ('type'=>'application/x-director', 'icon'=>'flash'),
'dxr' => array ('type'=>'application/x-director', 'icon'=>'flash'),
'eps' => array ('type'=>'application/postscript', 'icon'=>'eps'),
+ 'epub' => array ('type'=>'application/epub+zip', 'icon'=>'epub', 'groups'=>array('document')),
'fdf' => array ('type'=>'application/pdf', 'icon'=>'pdf'),
'flv' => array ('type'=>'video/x-flv', 'icon'=>'flash', 'groups'=>array('video','web_video'), 'string'=>'video'),
'f4v' => array ('type'=>'video/mp4', 'icon'=>'flash', 'groups'=>array('video','web_video'), 'string'=>'video'),
@@ -1819,10 +1820,14 @@ function get_mimetype_description($obj, $capitalise=false) {
$a[strtoupper($key)] = strtoupper($value);
$a[ucfirst($key)] = ucfirst($value);
}
- if (get_string_manager()->string_exists($mimetype, 'mimetypes')) {
- $result = get_string($mimetype, 'mimetypes', (object)$a);
- } else if (get_string_manager()->string_exists($mimetypestr, 'mimetypes')) {
- $result = get_string($mimetypestr, 'mimetypes', (object)$a);
+
+ // MIME types may include + symbol but this is not permitted in string ids.
+ $safemimetype = str_replace('+', '_', $mimetype);
+ $safemimetypestr = str_replace('+', '_', $mimetypestr);
+ if (get_string_manager()->string_exists($safemimetype, 'mimetypes')) {
+ $result = get_string($safemimetype, 'mimetypes', (object)$a);
+ } else if (get_string_manager()->string_exists($safemimetypestr, 'mimetypes')) {
+ $result = get_string($safemimetypestr, 'mimetypes', (object)$a);
} else if (get_string_manager()->string_exists('default', 'mimetypes')) {
$result = get_string('default', 'mimetypes', (object)$a);
} else {
View
BIN pix/f/epub.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit d6d6394

Please sign in to comment.