From 71ac2d19bbb0e05a536863cfc94ba89f6d6bb970 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Tue, 22 May 2007 19:16:58 +0000 Subject: [PATCH] Monotone-Parent: c204736a5f5dcfce7b1fd9db8327cbe1ff79c7aa Monotone-Revision: 70c743d917ef016d30989ee6038dc08f22b4d212 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2007-05-22T19:16:58 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 3 +++ SoObjects/Mailer/SOGoMailObject.m | 13 +++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 666e9294d..c142c23e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2007-05-22 Wolfgang Sourdeau + * SoObjects/Mailer/SOGoMailObject.m ([SOGoMailObject + -isDeletionAllowed]): completed method with the new imap acl api. + * SoObjects/SOGo/SOGoObject.m ([SOGoObject -defaultAclRoles]): removed method. diff --git a/SoObjects/Mailer/SOGoMailObject.m b/SoObjects/Mailer/SOGoMailObject.m index 14af16563..d0d29c05e 100644 --- a/SoObjects/Mailer/SOGoMailObject.m +++ b/SoObjects/Mailer/SOGoMailObject.m @@ -639,10 +639,15 @@ static BOOL debugSoParts = NO; /* permissions */ -- (BOOL)isDeletionAllowed { -#warning b0000ooo - return YES; -// return [[self container] isDeleteAndExpungeAllowed]; +- (BOOL) isDeletionAllowed +{ + NSArray *parentAcls; + NSString *login; + + login = [[context activeUser] login]; + parentAcl = [[self container] aclsForUser: login]; + + return [parentAcl containsObject: SOGoMailRole_MessageEraser]; } /* name lookup */