Merge branch 'MDL-38278-pptx-et-al-presentation-group' of https://git…

…hub.com/lucaboesch/moodle
ralferlebach · Mar 28, 2017 · ed8ab58 · ed8ab58
2 parents 3ecbebc + 5ee4e09
commit ed8ab58
Showing 1 changed file with 18 additions and 11 deletions.
diff --git a/lib/classes/filetypes.php b/lib/classes/filetypes.php
@@ -171,8 +171,10 @@ protected static function get_default_types() {
             'odm' => array('type' => 'application/vnd.oasis.opendocument.text-master', 'icon' => 'writer'),
             'odg' => array('type' => 'application/vnd.oasis.opendocument.graphics', 'icon' => 'draw'),
             'otg' => array('type' => 'application/vnd.oasis.opendocument.graphics-template', 'icon' => 'draw'),
-            'odp' => array('type' => 'application/vnd.oasis.opendocument.presentation', 'icon' => 'impress'),
-            'otp' => array('type' => 'application/vnd.oasis.opendocument.presentation-template', 'icon' => 'impress'),
+            'odp' => array('type' => 'application/vnd.oasis.opendocument.presentation', 'icon' => 'impress',
+                    'groups' => array('presentation')),
+            'otp' => array('type' => 'application/vnd.oasis.opendocument.presentation-template', 'icon' => 'impress',
+                    'groups' => array('presentation')),
             'ods' => array('type' => 'application/vnd.oasis.opendocument.spreadsheet',
                     'icon' => 'calc', 'groups' => array('spreadsheet')),
             'ots' => array('type' => 'application/vnd.oasis.opendocument.spreadsheet-template',
@@ -197,15 +199,19 @@ protected static function get_default_types() {
             'pps' => array('type' => 'application/vnd.ms-powerpoint', 'icon' => 'powerpoint', 'groups' => array('presentation')),
             'ppt' => array('type' => 'application/vnd.ms-powerpoint', 'icon' => 'powerpoint', 'groups' => array('presentation')),
             'pptx' => array('type' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
-                    'icon' => 'powerpoint'),
-            'pptm' => array('type' => 'application/vnd.ms-powerpoint.presentation.macroEnabled.12', 'icon' => 'powerpoint'),
+                    'icon' => 'powerpoint', 'groups' => array('presentation')),
+            'pptm' => array('type' => 'application/vnd.ms-powerpoint.presentation.macroEnabled.12', 'icon' => 'powerpoint',
+                    'groups' => array('presentation')),
             'potx' => array('type' => 'application/vnd.openxmlformats-officedocument.presentationml.template',
-                    'icon' => 'powerpoint'),
-            'potm' => array('type' => 'application/vnd.ms-powerpoint.template.macroEnabled.12', 'icon' => 'powerpoint'),
-            'ppam' => array('type' => 'application/vnd.ms-powerpoint.addin.macroEnabled.12', 'icon' => 'powerpoint'),
+                    'icon' => 'powerpoint', 'groups' => array('presentation')),
+            'potm' => array('type' => 'application/vnd.ms-powerpoint.template.macroEnabled.12', 'icon' => 'powerpoint',
+                    'groups' => array('presentation')),
+            'ppam' => array('type' => 'application/vnd.ms-powerpoint.addin.macroEnabled.12', 'icon' => 'powerpoint',
+                    'groups' => array('presentation')),
             'ppsx' => array('type' => 'application/vnd.openxmlformats-officedocument.presentationml.slideshow',
-                    'icon' => 'powerpoint'),
-            'ppsm' => array('type' => 'application/vnd.ms-powerpoint.slideshow.macroEnabled.12', 'icon' => 'powerpoint'),
+                    'icon' => 'powerpoint', 'groups' => array('presentation')),
+            'ppsm' => array('type' => 'application/vnd.ms-powerpoint.slideshow.macroEnabled.12', 'icon' => 'powerpoint',
+                    'groups' => array('presentation')),
             'ps' => array('type' => 'application/postscript', 'icon' => 'pdf'),
             'pub' => array('type' => 'application/x-mspublisher', 'icon' => 'publisher', 'groups' => array('presentation')),
 
@@ -247,8 +253,9 @@ protected static function get_default_types() {
             'stc' => array('type' => 'application/vnd.sun.xml.calc.template', 'icon' => 'calc'),
             'sxd' => array('type' => 'application/vnd.sun.xml.draw', 'icon' => 'draw'),
             'std' => array('type' => 'application/vnd.sun.xml.draw.template', 'icon' => 'draw'),
-            'sxi' => array('type' => 'application/vnd.sun.xml.impress', 'icon' => 'impress'),
-            'sti' => array('type' => 'application/vnd.sun.xml.impress.template', 'icon' => 'impress'),
+            'sxi' => array('type' => 'application/vnd.sun.xml.impress', 'icon' => 'impress', 'groups' => array('presentation')),
+            'sti' => array('type' => 'application/vnd.sun.xml.impress.template', 'icon' => 'impress',
+                    'groups' => array('presentation')),
             'sxg' => array('type' => 'application/vnd.sun.xml.writer.global', 'icon' => 'writer'),
             'sxm' => array('type' => 'application/vnd.sun.xml.math', 'icon' => 'math'),