See ChangeLog.

Monotone-Parent: f6c6bfab15922450127ccb9597bbc97468d695c0
Monotone-Revision: afd67b085b60bc29f1319198a1796a532db22ebf

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-10-21T20:12:38
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle committed 2011-10-21 20:12:38 +00:00
1 parent 19169e821d
commit f1da116a55
9 files changed
+75 -25

No files matched your search

+11 -9
View File
@@ -96,9 +96,6 @@
aclsEnum = [[self aclsForObject] objectEnumerator];
while ((currentUID = [aclsEnum nextObject]))
{
if ([currentUID hasPrefix: @"@"])
// NOTE: don't remove the prefix if we want to identify the lists visually
currentUID = [currentUID substringFromIndex: 1];
if (!([currentUID isEqualToString: ownerLogin]
|| [currentUID isEqualToString: defaultUserID]
|| [currentUID isEqualToString: @"anonymous"]))
@@ -117,20 +114,25 @@
- (NSString *) currentUser
{
return currentUser;
return ([currentUser hasPrefix: @"@"]
? [currentUser substringFromIndex: 1]
: currentUser);
}
- (NSString *) currentUserClass
{
return ([currentUser hasPrefix: @"@"]
? @"normal-group"
: @"normal-user");
}
- (NSString *) currentUserDisplayName
{
SOGoUserManager *um;
NSString *s;
um = [SOGoUserManager sharedUserManager];
s = ([currentUser hasPrefix: @"@"]
? [currentUser substringFromIndex: 1]
: currentUser);
return [um getFullEmailForUID: s];
return [um getFullEmailForUID: [self currentUser]];
}
- (BOOL) canSubscribeUsers