(fix) honor groups when setting IMAP ACLs

NEWS

@@ -17,6 +17,7 @@ Bug fixes
  - [web] fixed saving value of receipt action for main IMAP account
  - [web] fixed search results in Calendar module when targeting all events
  - [core] honor IMAPLoginFieldName also when setting IMAP ACLs
+ - [core] honor groups when setting IMAP ACLs
 
 4.0.8 (2019-07-19)
 ------------------

SoObjects/Mailer/SOGoMailFolder.m

@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2009-2017 Inverse inc.
+  Copyright (C) 2009-2019 Inverse inc.
   Copyright (C) 2004-2005 SKYRIX Software AG
 
   This file is part of SOGo.
@@ -58,6 +58,7 @@
 #import <SOGo/NSObject+DAV.h>
 #import <SOGo/SOGoPermissions.h>
 #import <SOGo/SOGoSystemDefaults.h>
+#import <SOGo/SOGoGroup.h>
 #import <SOGo/SOGoUser.h>
 #import <SOGo/SOGoUserFolder.h>
 #import <SOGo/SOGoUserManager.h>
@@ -1424,8 +1425,15 @@ _compareFetchResultsByMODSEQ (id entry1, id entry2, void *data)
 
 - (NSString *) _sogoACLUIDToIMAPUID: (NSString *) uid
 {
+  SOGoGroup *group;
   SOGoUser *user;
 
+  group = [SOGoGroup groupWithIdentifier: uid
+                                inDomain: [[context activeUser] domain]];
+  if (group)
+    return [[[[context activeUser] domainDefaults] imapAclGroupIdPrefix]
+             stringByAppendingString: uid];
+
   user = [SOGoUser userWithLogin: uid];
 
   if ([uid hasPrefix: @"@"])