[ZF-9004] Zend_Validate:

- added new mimetypes for image and compression detection

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@21137 44c647ce-9c0f-0410-b52a-842ac1e357ba

library/Zend/Validate/File/IsCompressed.php

@@ -63,23 +63,39 @@ class Zend_Validate_File_IsCompressed extends Zend_Validate_File_MimeType
         }
 
         $temp    = array();
-        $default = array(
-            'application/x-tar',
-            'application/x-cpio',
-            'application/x-debian-package',
-            'application/x-archive',
+        // http://de.wikipedia.org/wiki/Liste_von_Dateiendungen
+            $default = array(
+            'application/arj',
+            'application/gnutar',
+            'application/lha',
+            'application/lzx',
+            'application/vnd.ms-cab-compressed',
+            'application/x-ace-compressed',
             'application/x-arc',
+            'application/x-archive',
             'application/x-arj',
-            'application/x-lharc',
+            'application/x-bzip',
+            'application/x-bzip2',
+            'application/x-cab-compressed',
+            'application/x-compress',
+            'application/x-compressed',
+            'application/x-cpio',
+            'application/x-debian-package',
+            'application/x-eet',
+            'application/x-gzip',
+            'application/x-java-pack200',
             'application/x-lha',
+            'application/x-lharc',
+            'application/x-lzh',
+            'application/x-lzma',
+            'application/x-lzx',
             'application/x-rar',
+            'application/x-sit',
+            'application/x-stuffit',
+            'application/x-tar',
             'application/zip',
             'application/zoo',
-            'application/x-eet',
-            'application/x-java-pack200',
-            'application/x-compress',
-            'application/x-gzip',
-            'application/x-bzip2'
+            'multipart/x-gzip',
         );
 
         if (is_array($mimetype)) {

library/Zend/Validate/File/IsImage.php

@@ -63,27 +63,63 @@ class Zend_Validate_File_IsImage extends Zend_Validate_File_MimeType
         }
 
         $temp    = array();
+        // http://de.wikipedia.org/wiki/Liste_von_Dateiendungen
+        // http://www.iana.org/assignments/media-types/image/
         $default = array(
-            'image/x-quicktime',
+            'application/cdf',
+            'application/dicom',
+            'application/fractals',
+            'application/postscript',
+            'application/vnd.hp-hpgl',
+            'application/vnd.oasis.opendocument.graphics',
+            'application/x-cdf',
+            'application/x-cmu-raster',
+            'application/x-ima',
+            'application/x-inventor',
+            'application/x-koan',
+            'application/x-portable-anymap',
+            'application/x-world-x-3dmf',
+            'image/bmp',
+            'image/c',
+            'image/cgm',
+            'image/fif',
+            'image/gif',
+            'image/jpeg',
+            'image/jpm',
+            'image/jpx',
             'image/jp2',
-            'image/x-xpmi',
-            'image/x-portable-bitmap',
-            'image/x-portable-greymap',
-            'image/x-portable-pixmap',
-            'image/x-niff',
-            'image/tiff',
+            'image/naplps',
+            'image/pjpeg',
             'image/png',
-            'image/x-unknown',
-            'image/gif',
-            'image/x-ms-bmp',
-            'application/dicom',
+            'image/svg',
+            'image/svg+xml',
+            'image/tiff',
             'image/vnd.adobe.photoshop',
             'image/vnd.djvu',
+            'image/vnd.fpx',
+            'image/vnd.net-fpx',
+            'image/x-cmu-raster',
+            'image/x-cmx',
+            'image/x-coreldraw',
             'image/x-cpi',
-            'image/jpeg',
+            'image/x-emf',
             'image/x-ico',
-            'image/x-coreldraw',
-            'image/svg+xml'
+            'image/x-icon',
+            'image/x-jg',
+            'image/x-ms-bmp',
+            'image/x-niff',
+            'image/x-pict',
+            'image/x-pcx',
+            'image/x-portable-anymap',
+            'image/x-portable-bitmap',
+            'image/x-portable-greymap',
+            'image/x-portable-pixmap',
+            'image/x-quicktime',
+            'image/x-rgb',
+            'image/x-tiff',
+            'image/x-unknown',
+            'image/x-windows-bmp',
+            'image/x-xpmi',
         );
 
         if (is_array($mimetype)) {