Added invitation delegation support in Web interface. See ChangeLog.

Monotone-Parent: 4d711e074341810486c1842c6a345777cc3664bb
Monotone-Revision: 2fc8598099b516f243935e73039200f1c004784e

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2009-09-10T18:31:20
Monotone-Branch: ca.inverse.sogo

SoObjects/SOGo/LDAPSource.m

@@ -658,14 +658,27 @@ static NSLock *lock;
   NSMutableDictionary *contactEntry;
   NSEnumerator *attributes;
   NSString *currentAttribute, *value;
+  NSArray *classes;
 
   contactEntry = [NSMutableDictionary dictionary];
   [contactEntry setObject: [ldapEntry dn] forKey: @"dn"];
+  classes = [ldapEntry objectClasses];
 
-  if ([ldapEntry objectClasses])
-    [contactEntry setObject: [ldapEntry objectClasses]
-                     forKey: @"objectClasses"];
-  attributes = [[self _searchAttributes] objectEnumerator];
+  if (classes)
+    {
+      [contactEntry setObject: classes
+		       forKey: @"objectClasses"];
+      attributes = [[self _searchAttributes] objectEnumerator];
+
+      if ([classes containsObject: @"group"] ||
+	  [classes containsObject: @"groupOfNames"] ||
+	  [classes containsObject: @"groupOfUniqueNames"] ||
+	  [classes containsObject: @"posixGroup"])
+	{
+	  [contactEntry setObject: [NSNumber numberWithInt: 1]
+			   forKey: @"isGroup"];
+	}
+    }
   while ((currentAttribute = [attributes nextObject]))
     {
       value = [[ldapEntry attributeWithName: currentAttribute]
@@ -887,10 +900,12 @@ static NSLock *lock;
 
 - (NGLdapEntry *) lookupGroupEntryByEmail: (NSString *) theEmail
 {
+#warning We should support MailFieldNames
   return [self lookupGroupEntryByAttribute: @"mail"
 	       andValue: theEmail];
 }
 
+// This method should accept multiple attributes
 - (NGLdapEntry *) lookupGroupEntryByAttribute: (NSString *) theAttribute 
 				     andValue: (NSString *) theValue
 {
@@ -911,9 +926,6 @@ static NSLock *lock;
 	  EOQualifier *qualifier;
 	  NSString *s;
 	  
-	  // FIXME
-
-	  // we should support MailFieldNames?
 	  s = [NSString stringWithFormat: @"(%@='%@')",
                         theAttribute, SafeLDAPCriteria (theValue)];
 	  qualifier = [EOQualifier qualifierWithQualifierFormat: s];