propagate from branch 'ca.inverse.sogo.1_3_14' (head 137ce0e5b4a2b4afe3b810e582cbe613caf2bb20)

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

Monotone-Parent: 137ce0e5b4a2b4afe3b810e582cbe613caf2bb20
Monotone-Parent: be8cb88c243416af5fba817c001afc33ead04b69
Monotone-Revision: 7f28bdd3182eaceae80acddcd3e23dc4e50b2821

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-03-26T16:23:38
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];