This commit is contained in:
Ludovic Marcotte
2013-09-27 15:36:46 -04:00
parent 3dbfb0ed2d
commit 84e999229b
6 changed files with 13 additions and 8 deletions

View File

@@ -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;

View File

@@ -83,6 +83,8 @@
- (NSString *)pathToAttachmentObject; /* link to SoObject */
- (NSString *)pathToAttachment; /* download link */
- (NSString *) mimeImageURL;
@end
#endif /* __Mailer_UIxMailPartViewer_H__ */

View File

@@ -304,7 +304,7 @@
return url;
}
- (NSString *) mimeImageUrl
- (NSString *) mimeImageURL
{
NSString *mimeImageFile, *mimeImageUrl;

View File

@@ -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];

View File

@@ -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"

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB