From 84e999229bd2e0ca5c76b613dbfab7b15432bfcc Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Fri, 27 Sep 2013 15:36:46 -0400 Subject: [PATCH] Fix for bug #2270 --- UI/MailPartViewers/UIxMailPartLinkViewer.h | 9 +++++---- UI/MailPartViewers/UIxMailPartViewer.h | 2 ++ UI/MailPartViewers/UIxMailPartViewer.m | 2 +- UI/MailPartViewers/UIxMailRenderingContext.m | 6 ++++-- .../MailPartViewers/UIxMailPartLinkViewer.wox | 2 +- UI/WebServerResources/mime-image-pdf.png | Bin 0 -> 3466 bytes 6 files changed, 13 insertions(+), 8 deletions(-) create mode 100644 UI/WebServerResources/mime-image-pdf.png diff --git a/UI/MailPartViewers/UIxMailPartLinkViewer.h b/UI/MailPartViewers/UIxMailPartLinkViewer.h index d89421511..5777f9863 100644 --- a/UI/MailPartViewers/UIxMailPartLinkViewer.h +++ b/UI/MailPartViewers/UIxMailPartLinkViewer.h @@ -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; diff --git a/UI/MailPartViewers/UIxMailPartViewer.h b/UI/MailPartViewers/UIxMailPartViewer.h index fd0423203..ce8f35f67 100644 --- a/UI/MailPartViewers/UIxMailPartViewer.h +++ b/UI/MailPartViewers/UIxMailPartViewer.h @@ -83,6 +83,8 @@ - (NSString *)pathToAttachmentObject; /* link to SoObject */ - (NSString *)pathToAttachment; /* download link */ +- (NSString *) mimeImageURL; + @end #endif /* __Mailer_UIxMailPartViewer_H__ */ diff --git a/UI/MailPartViewers/UIxMailPartViewer.m b/UI/MailPartViewers/UIxMailPartViewer.m index 4e684d092..21aeec623 100644 --- a/UI/MailPartViewers/UIxMailPartViewer.m +++ b/UI/MailPartViewers/UIxMailPartViewer.m @@ -304,7 +304,7 @@ return url; } -- (NSString *) mimeImageUrl +- (NSString *) mimeImageURL { NSString *mimeImageFile, *mimeImageUrl; diff --git a/UI/MailPartViewers/UIxMailRenderingContext.m b/UI/MailPartViewers/UIxMailRenderingContext.m index 37fcdceb1..03df297cc 100644 --- a/UI/MailPartViewers/UIxMailRenderingContext.m +++ b/UI/MailPartViewers/UIxMailRenderingContext.m @@ -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]; diff --git a/UI/Templates/MailPartViewers/UIxMailPartLinkViewer.wox b/UI/Templates/MailPartViewers/UIxMailPartLinkViewer.wox index bf985eb64..1e7368086 100644 --- a/UI/Templates/MailPartViewers/UIxMailPartLinkViewer.wox +++ b/UI/Templates/MailPartViewers/UIxMailPartLinkViewer.wox @@ -10,7 +10,7 @@ + >
uc7#nZ3ZvRaI5x z4dXvsCtiO0bs+WJqLlIg#+p$wQuew;wXqdkCAHVccD|JNtgjac|2*6kNdw!At>50( z32aYo_w)?{KFKHfB#yflV6%v;*9N@x*1yD~Il~ybW1u)90Wq{9_Gx>LyM7CCQa)cO zf-9=`-gQiz}#`wfM(aXx3ssYwBMX% zR^XisvHvFw5d@FN;{jAPms3^X;>C*>FI)hEK}87$fkZq$+TQ|nEp3;({sz3!{O0Q4 z?*bO21?iLI<}qR&3@C@#O@%mF;>HYXyJ{?`2D~-jnn%AyQ4~EMAe&XyOom9t$_fw& zC`u>f-|{zlKt>dwbwlkm3OAv@r76gxn=ZRZgC;+;y>$(p3 z{j#hm)QbYBB$X1~yGjx;e)j0ANBV$$?f2Yy@3dif1Kxl)uzp6YO9ip@d^uq3wAr5H z*fygQ>&>N>*R-oA`YdeN$JPtGNexgzc0ipBabpAv!djS7jX~D5l_AzSa-0b`&vTq00LPEN z`|dmM5S3Xd0D>Tjq6jF8->)b@Fc=C20zhw1-;Uk@aB}2>#ZzAcKAO1LdLd~TU0>bi z?e3~y64s%DSkRK?TD_X->8YvdX|kYVvDUuX#+y}cAC1L|@^b69rfHh41Eo@_R4S2l zsYKG6W~!t>AQ<%f$$3H$fOtF}@9P74=lhJFe*!0$Pd)tpV?YDScM)KoGF z6pN+=u#aFASm&hOCBV+a+Le-(M3JbN-rl~xo*uyGlO#z3LLqXnEEb7mPzh00RlRx@ zSX*0LTU!Gb7E-BH3TWTo@w1NGfSLK(U(5(VJKA@4XtkrcE*0dKLyRg(Q3+r%jOyV^ zUXa_jVVJD4Go!Kh8eXs0>-C!BheDxHC;YB;RqAlnVDpAW(Fu0i$$vqD3^k2`?&I4+^DIksi~<6Xm9W6Xltv#?@C1GP8c2z zM$E5^@pvN9*XLfZT;aHzUn(t?0B>~I%spadFOeik zl4U@@QTvKET>m%?P(k(*!ytaPyT5Kd7TIGqmHIdPWCbFw1(mae;{dN$6un-KbGi(* zQbSZwC4b!>o3x))SrF2LQh5oRSTUgb!7ZP8xwlri-}S-Y02So6fP)7Q9(?ps(~V>G zLTtw7T;q5=B>H*y@ZrNxK4}`&vuBgZ*;!(n3I#jF?yE7|J5_7#xVX%--Uj8vI8_e$ z7DdBQRX`MdK2|@}4_{thSxKi!5Uf}PIy>9jTU*QP>pB^k=WAzJp#T_$u3Mdh{{H^{ zc)XT%ZWNc=Xu~RqF3cH&iAMc?t%5(S>jW4@5d^OnNT=7N}f$iJ3Zf$8X zLk7#stE-s|(A*pj2Lk2&Wir`pE=R)3l4MF4Wf;eim`*a8OrAY!Kc7@vBVbBEBEe?h zbyGo36+*vTS`@`?Is;Dp3@Hfq|Z$)>fdYiS(Pzk|^f+ z^Yim7D(J1&Eq=HOVnEBCYtr9>;*9(PG37DO| zbZL1R2n4)dqM}5xSR^~&*}vBdoH+5}houq_4oi}z0l}c(&s&1*^o@fl0fU1B1NE=7 zy0N}S62O*$azDMLMNwE1AP6202?vvXs%gX)#9~cNUN0~_+}Rn80*4Mg|NNOVKqj-c zrYJx>-r5=toBbR=J~g$p1l)iB?YDPy04*)yFa_Q^E>%sG0n^hYMpYN;IG*`I>I^W;dD&tJJhmT~2ZwH;AKy3TPV46N%`;8e9x&@|xErKP1p0qE{- zZ6(T#P1X>IHMB7~IXO8sRW1Rt?DxwukVqsFEH8%@!>Z-tXHyu!8pvr2o_>0K+%SOI z*;GnZN#1+!+5gu=cilBMHZ%krI&|a+K-|(wZe(X?Bq9jFfdhN?5OYuFH#|H%JT&A6 zZ*9QWgG)79hYE7q0H+Zq>HYg3fBeN4X`bClb*9Zc`x2ceY}SF#J>O3C$D1gi<>wsd z#n48mf#GQOfvgZ5%zv+VG8Sx*_mU#XtiF6I@j?TP(k+e^fWnf7K^5?t-Qm_ zd#qgU4tTY>IiapxW*aqn+OP_8BkHbML2v?Qbq}38+&%5yk3DT|UCs#B zYYx`SyK1j8HcAatL3X14wkZMZ16w(5eCO9H8E)%g1>?M4@`{2=0IQ$ts)C$Uj|AB3 zRM!2hbS*o+`nt*=bg?C5W4LUX0rn}m)6~@DB#{6!=CU3e;PW|kFD-R{PsDos#d-$d z&V)+9ulM$sO*J!sJTGzQv-66Pz6)Z7tE;)CtetN5Z^CT7#%F_W1>Sw{vRJ}m4~r4b z^^=EOhC!}GtIJ^3*U{vOo?&D%nM@|bvi_A%gw2x}s2Kevt`?w#{0nHc4b|1N1B22(c-EBS4 zm}%=CXXmqLT&=uTVn4lfZXo+Q4TJv?{}BHZAe+r*v#aJ+DtQ8F7;eA5bY%d29ZWCJ zv)ODmn+1Y@3~p&k0q1^mo}1eO^laJQ+}lEdzILy4t~XKOXSs9SEC)nBj2w(S1!QB{ zN3!<=ilQirV&X^{;v`oF&<27)o@LVx6ZiI=9ask5*mLyKk=KFjP1)zOZv%Qv@6;n~ z&AGm3hu5}Uy~M3@i`-Qp^y5%hNCZYMe(B-S1fcX1oXp=Juz~-7Kh-8oZGft(s;Yka zOL^6l2pUzSs_OGXl0;rp(-U$a5C{YUWGE1vQrb2e5iX86JCW-~a#s07*qoM6N<$g6=PyUjP6A literal 0 HcmV?d00001