propagate from branch 'ca.inverse.sogo.1_3_14' (head 3c8a49fe7ef93ec55aaeef9dd064be1de6052cfe)

to branch 'ca.inverse.sogo' (head d93bbab8d949fa50be1d182af68b2eecf4c79105)

Monotone-Parent: 3c8a49fe7ef93ec55aaeef9dd064be1de6052cfe
Monotone-Parent: d93bbab8d949fa50be1d182af68b2eecf4c79105
Monotone-Revision: 8d867d6c59e7ebea428c107ce0681159571e7c90

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-03-21T15:50:33
Monotone-Branch: ca.inverse.sogo

SoObjects/SOGo/SOGoUserFolder.m

@@ -635,6 +635,54 @@
 	   getCNForUID: nameInContainer];
 }
 
+/* For firstname and lastname, we handle "Firstname Blabla Lastname" and
+   "Lastname, Firstname Blabla" */
+- (NSString *) davLastName
+{
+  NSArray *parts;
+  NSString *cn, *lastName;
+  NSRange comma;
+
+  cn = [self davDisplayName];
+  comma = [cn rangeOfString: @","];
+  if (comma.location != NSNotFound)
+    lastName = [[cn substringToIndex: comma.location]
+                 stringByTrimmingSpaces];
+  else
+    {
+      parts = [cn componentsSeparatedByString: @" "];
+      if ([parts count] > 0)
+        lastName = [parts lastObject];
+      else
+        lastName = nil;
+    }
+
+  return lastName;
+}
+
+- (NSString *) davFirstName
+{
+  NSArray *parts;
+  NSString *subtext, *cn, *firstName;
+  NSRange comma;
+
+  cn = [self davDisplayName];
+  comma = [cn rangeOfString: @","];
+  if (comma.location != NSNotFound)
+    subtext = [[cn substringFromIndex: comma.location]
+                stringByTrimmingSpaces];
+  else
+    subtext = cn;
+
+  parts = [subtext componentsSeparatedByString: @" "];
+  if ([parts count] > 0)
+    firstName = [parts objectAtIndex: 0];
+  else
+    firstName = nil;
+
+  return firstName;
+}
+
 - (NSString *) davResourceId
 {
   return [NSString stringWithFormat: @"urn:uuid:%@", nameInContainer];