amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-06-24 03:14:17 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: 9a3d09f13e9068acf26d0472c7db733c9c3d7a77

Browse Source 
Monotone-Revision: f775647c24125f4df21cdc41b3c4eae6eccec830

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2007-10-19T19:03:21
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2007-10-19 19:03:21 +00:00
parent 754e5024d4
commit b1c41eb8b9
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+8
View File
@@ -1,3 +1,11 @@
2007-10-19 Francis Lachapelle <flachapelle@inverse.ca>
* SoObjects/SOGo/SOGoUser.m
([SOGoUser -rolesForObject:objectinContext:context]): allow
multiple super usernames to be defined. The user default
SOGoSuperUsername is renamed SOGoSuperUsernames and must be
an array.
2007-10-18 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/SOGo/SOGoWebAuthenticator.m ([SOGoWebAuthenticator
SoObjects/SOGo/SOGoUser.m
+5 -7
View File
@@ -42,7 +42,7 @@
static NSTimeZone *serverTimeZone = nil;
static NSString *fallbackIMAP4Server = nil;
static NSString *defaultLanguage = nil;
static NSString *superUsername = nil;
static NSArray *superUsernames = nil;
static NSURL *AgenorProfileURL = nil;
static BOOL acceptAnyUser = NO;
@@ -82,7 +82,7 @@ NSString *SOGoWeekStartFirstFullWeek = @"FirstFullWeek";
+ (void) initialize
{
NSString *tzName, *nsUsername;
NSString *tzName;
NSUserDefaults *ud;
NSString *profileURL;
@@ -109,11 +109,9 @@ NSString *SOGoWeekStartFirstFullWeek = @"FirstFullWeek";
if (!defaultLanguage)
ASSIGN (defaultLanguage, @"English");
}
if (!superUsername)
if (!superUsernames)
{
nsUsername = [ud stringForKey: @"SOGoSuperUsername"];
if ([nsUsername length] > 0)
ASSIGN (superUsername, nsUsername);
superUsernames = [ud arrayForKey: @"SOGoSuperUsernames"];
}
acceptAnyUser = ([[ud stringForKey: @"SOGoAuthentificationMethod"]
@@ -569,7 +567,7 @@ NSString *SOGoWeekStartFirstFullWeek = @"FirstFullWeek";
if (sogoRoles)
[rolesForObject addObjectsFromArray: sogoRoles];
if ((superUsername && [login isEqualToString: superUsername])
if ((superUsernames && [superUsernames containsObject: login])
|| [[object ownerInContext: context] isEqualToString: login])
[rolesForObject addObject: SoRole_Owner];
if ([object isKindOfClass: [SOGoObject class]])