(feat) new viewer handler for encrypted emails
parent
72273bf454
commit
3f95d53de8
|
@ -1,20 +1,21 @@
|
||||||
/*
|
/*
|
||||||
|
Copyright (C) 2005-2017 Inverse inc.
|
||||||
Copyright (C) 2004-2005 SKYRIX Software AG
|
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
|
the terms of the GNU Lesser General Public License as published by the
|
||||||
Free Software Foundation; either version 2, or (at your option) any
|
Free Software Foundation; either version 2, or (at your option) any
|
||||||
later version.
|
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
|
WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||||
FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
|
FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
|
||||||
License for more details.
|
License for more details.
|
||||||
|
|
||||||
You should have received a copy of the GNU Lesser General Public
|
You should have received a copy of the GNU Lesser General Public
|
||||||
License along with OGo; see the file COPYING. If not, write to the
|
License along withS OGo; see the file COPYING. If not, write to the
|
||||||
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
|
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
|
||||||
02111-1307, USA.
|
02111-1307, USA.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2007-2013 Inverse inc.
|
Copyright (C) 2007-2017 Inverse inc.
|
||||||
Copyright (C) 2004-2005 SKYRIX Software AG
|
Copyright (C) 2004-2005 SKYRIX Software AG
|
||||||
|
|
||||||
This file is part of SOGo.
|
This file is part of SOGo.
|
||||||
|
@ -125,6 +125,11 @@ static BOOL showNamedTextAttachmentsInline = NO;
|
||||||
return [viewer pageWithName: @"UIxMailPartMixedViewer"];
|
return [viewer pageWithName: @"UIxMailPartMixedViewer"];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
- (WOComponent *) encryptedViewer
|
||||||
|
{
|
||||||
|
return [viewer pageWithName: @"UIxMailPartEncryptedViewer"];
|
||||||
|
}
|
||||||
|
|
||||||
- (WOComponent *) signedViewer
|
- (WOComponent *) signedViewer
|
||||||
{
|
{
|
||||||
/* Note: we cannot cache the multipart viewers, because it can be nested */
|
/* Note: we cannot cache the multipart viewers, because it can be nested */
|
||||||
|
@ -156,11 +161,7 @@ static BOOL showNamedTextAttachmentsInline = NO;
|
||||||
|
|
||||||
- (WOComponent *) htmlViewer
|
- (WOComponent *) htmlViewer
|
||||||
{
|
{
|
||||||
id o;
|
return [viewer pageWithName: @"UIxMailPartHTMLViewer"];
|
||||||
|
|
||||||
o = [viewer pageWithName: @"UIxMailPartHTMLViewer"];
|
|
||||||
|
|
||||||
return o;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
- (WOComponent *) messageViewer
|
- (WOComponent *) messageViewer
|
||||||
|
@ -251,6 +252,10 @@ static BOOL showNamedTextAttachmentsInline = NO;
|
||||||
if ([st isEqualToString:@"ics"]) /* Cooqle K4lendahr - Google Calendar */
|
if ([st isEqualToString:@"ics"]) /* Cooqle K4lendahr - Google Calendar */
|
||||||
return [self iCalViewer];
|
return [self iCalViewer];
|
||||||
|
|
||||||
|
if ([st isEqualToString: @"x-pkcs7-mime"] ||
|
||||||
|
[st isEqualToString: @"pkcs7-mime"])
|
||||||
|
return [self encryptedViewer];
|
||||||
|
|
||||||
#if 0 /* the link viewer looks better than plain text ;-) */
|
#if 0 /* the link viewer looks better than plain text ;-) */
|
||||||
if ([st isEqualToString: @"pgp-signature"]) // TODO: real PGP viewer
|
if ([st isEqualToString: @"pgp-signature"]) // TODO: real PGP viewer
|
||||||
return [self textViewer];
|
return [self textViewer];
|
||||||
|
|
Loading…
Reference in New Issue