See ChangeLog.

Monotone-Parent: d880f3f750251d35b56db7d720ccacbdeead7540
Monotone-Revision: 05f8b72feb6a6c81f20462457e2dbc6c47ae9edc

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-02-01T21:11:28

UI/Common/UIxUserRightsEditor.m

@@ -62,6 +62,15 @@
   return uid;
 }
 
+- (NSString *) folderName
+{
+  id folder;
+  
+  folder = [context clientObject];
+  
+  return [folder displayName];
+}
+
 - (BOOL) userIsDefaultUser
 {
   if (!defaultUserID)
@@ -79,11 +88,21 @@
 {
   SOGoUserManager *um;
 
-  um = [SOGoUserManager sharedUserManager];
-
-  return [NSString stringWithFormat: @"%@ <%@>",
-		   [um getCNForUID: uid],
-		   [um getEmailForUID: uid]];
+  if ([self userIsAnonymousUser])
+    {
+      return [self labelForKey: @"Public Access"];
+    }
+  else if ([self userIsDefaultUser])
+    {
+      return [self labelForKey: @"Any Authenticated User"];
+    }
+  else
+    {
+      um = [SOGoUserManager sharedUserManager];
+      return [NSString stringWithFormat: @"%@ <%@>",
+                        [um getCNForUID: uid],
+                     [um getEmailForUID: uid]];
+    }
 }
 
 - (BOOL) _initRights