mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-02-17 07:33:57 +00:00
Fix for bug #2270
This commit is contained in:
@@ -1,14 +1,15 @@
|
||||
/*
|
||||
Copyright (C) 2007-2013 Inverse inc.
|
||||
Copyright (C) 2004-2005 SKYRIX Software AG
|
||||
|
||||
This file is part of OpenGroupware.org.
|
||||
This file is part of SOGo.
|
||||
|
||||
OGo is free software; you can redistribute it and/or modify it under
|
||||
SOGo is free software; you can redistribute it and/or modify it under
|
||||
the terms of the GNU Lesser General Public License as published by the
|
||||
Free Software Foundation; either version 2, or (at your option) any
|
||||
later version.
|
||||
|
||||
OGo is distributed in the hope that it will be useful, but WITHOUT ANY
|
||||
SOGo is distributed in the hope that it will be useful, but WITHOUT ANY
|
||||
WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
|
||||
License for more details.
|
||||
@@ -37,7 +38,7 @@
|
||||
encoding = BASE64;
|
||||
parameterList = {
|
||||
"x-unix-mode" = 0666;
|
||||
name = "IncoWEBOpenGroupwarepresentation.pdf";
|
||||
name = "SOGo.pdf";
|
||||
};
|
||||
size = 1314916;
|
||||
subtype = PDF; type = application;
|
||||
|
||||
@@ -83,6 +83,8 @@
|
||||
- (NSString *)pathToAttachmentObject; /* link to SoObject */
|
||||
- (NSString *)pathToAttachment; /* download link */
|
||||
|
||||
- (NSString *) mimeImageURL;
|
||||
|
||||
@end
|
||||
|
||||
#endif /* __Mailer_UIxMailPartViewer_H__ */
|
||||
|
||||
@@ -304,7 +304,7 @@
|
||||
return url;
|
||||
}
|
||||
|
||||
- (NSString *) mimeImageUrl
|
||||
- (NSString *) mimeImageURL
|
||||
{
|
||||
NSString *mimeImageFile, *mimeImageUrl;
|
||||
|
||||
|
||||
@@ -213,8 +213,10 @@ static BOOL showNamedTextAttachmentsInline = NO;
|
||||
return [self iCalViewer];
|
||||
}
|
||||
|
||||
// Tiffs aren't well-supported
|
||||
if ([mt isEqualToString:@"image"] && ![st isEqualToString: @"tiff"])
|
||||
// TIFF files aren't well-supported and Thunderbird sometimes send PDF
|
||||
// files over as image/pdf !
|
||||
if ([mt isEqualToString:@"image"] &&
|
||||
!([st isEqualToString: @"tiff"] || [st isEqualToString: @"pdf"]))
|
||||
{
|
||||
if ([self _shouldDisplayAsAttachment: _info textPart: NO])
|
||||
return [self linkViewer];
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
<a var:href="pathToAttachment"
|
||||
var:title="filenameForDisplay"
|
||||
const:absolute="YES"
|
||||
><img var:src="mimeImageUrl" />
|
||||
><img var:src="mimeImageURL" />
|
||||
</a>
|
||||
<div class="linked_attachment_meta">
|
||||
<var:string value="filenameForDisplay"
|
||||
|
||||
BIN
UI/WebServerResources/mime-image-pdf.png
Normal file
BIN
UI/WebServerResources/mime-image-pdf.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.4 KiB |
Reference in New Issue
Block a user