projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removing advanced_tree configuration variable. code is moved to templates
[squirrelmail.git]
/
functions
/
attachment_common.php
diff --git
a/functions/attachment_common.php
b/functions/attachment_common.php
index 8a7db6346157eb122b188faa5cb5a6fdd9c6347b..3b9e561a923b7de4fa8baeb079293b0b14a8367a 100644
(file)
--- a/
functions/attachment_common.php
+++ b/
functions/attachment_common.php
@@
-5,7
+5,7
@@
*
* This file provides the handling of often-used attachment types.
*
*
* This file provides the handling of often-used attachment types.
*
- * @copyright © 1999-200
5
The SquirrelMail Project Team
+ * @copyright © 1999-200
6
The SquirrelMail Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package squirrelmail
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package squirrelmail
@@
-36,6
+36,7
@@
$FileExtensionToMimeType = array('bmp' => 'image/x-bitmap',
'gif' => 'image/gif',
'htm' => 'text/html',
'html' => 'text/html',
'gif' => 'image/gif',
'htm' => 'text/html',
'html' => 'text/html',
+ 'jpe' => 'image/jpeg',
'jpg' => 'image/jpeg',
'jpeg' => 'image/jpeg',
'php' => 'text/plain',
'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');
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;
(!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/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');
}
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;
*/
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/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');
}
register_attachment_common('image/gif', 'link_image');
register_attachment_common('image/png', 'link_image');