From: tokul <tokul@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Fri, 11 Nov 2005 06:32:56 +0000 (+0000)
Subject: add image/jpg mime type and .jpe extension
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=6cbe465cc1319bf938d9f55014870f9853d7ca9b;p=squirrelmail.git

add image/jpg mime type and .jpe extension


git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@10327 7612ce4b-ef26-0410-bec9-ea0150e637f0
---

diff --git a/functions/attachment_common.php b/functions/attachment_common.php
index 8a7db634..55de5d58 100644
--- a/functions/attachment_common.php
+++ b/functions/attachment_common.php
@@ -36,6 +36,7 @@ $FileExtensionToMimeType = array('bmp'  => 'image/x-bitmap',
                                  'gif'  => 'image/gif',
                                  'htm'  => 'text/html',
                                  'html' => 'text/html',
+                                 'jpe'  => 'image/jpeg',
                                  'jpg'  => 'image/jpeg',
                                  'jpeg' => 'image/jpeg',
                                  'php'  => 'text/plain',
@@ -56,12 +57,12 @@ if (isset($attachment_common_types)) {
     foreach ($attachment_common_types as $val => $v) {
         if ($val == 'image/gif')
             register_attachment_common('image/gif',       'link_image');
-        elseif (($val == 'image/jpeg' || $val == 'image/pjpeg') and
+        elseif (($val == 'image/jpeg' || $val == 'image/pjpeg' || $val == 'image/jpg') and
                 (!isset($jpeg_done))) {
             $jpeg_done = 1;
+            register_attachment_common('image/jpg',       'link_image');
             register_attachment_common('image/jpeg',      'link_image');
             register_attachment_common('image/pjpeg',     'link_image');
-            // register_attachment_common('image/jpg',       'link_image');
         }
         elseif ($val == 'image/png')
             register_attachment_common('image/png',       'link_image');
@@ -74,9 +75,9 @@ if (isset($attachment_common_types)) {
              */
             if (! isset($jpeg_done)) {
                 $jpeg_done = 1;
+                register_attachment_common('image/jpg',   'link_image');
                 register_attachment_common('image/jpeg',  'link_image');
                 register_attachment_common('image/pjpeg', 'link_image');
-                // register_attachment_common('image/jpg',       'link_image');
             }
             register_attachment_common('image/gif',       'link_image');
             register_attachment_common('image/png',       'link_image');