amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-09-19 12:22:52 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: ab81a2b3344ce13069fdc2f4762e128a13136bb3

Browse Source 
Monotone-Revision: 6f946a78a43cf1914cfbcff43562c9c0ed48a1b0

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-07-25T17:52:49
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2008-07-25 17:52:49 +00:00
parent 8a17179ab1
commit c4f917942d
19 changed files with 69 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/SOGo/SOGoUser.m
+13 -11
View File
@@ -35,7 +35,7 @@
#import <NGExtensions/NSNull+misc.h>
#import <NGExtensions/NSObject+Logs.h>
#import "AgenorUserDefaults.h"
#import "SOGoUserDefaults.h"
#import "LDAPUserManager.h"
#import "NSArray+Utilities.h"
#import "SOGoCache.h"
@@ -50,7 +50,7 @@ static NSString *fallbackIMAP4Server = nil;
static BOOL fallbackIsConfigured = NO;
static NSString *defaultLanguage = nil;
static NSArray *superUsernames = nil;
static NSURL *AgenorProfileURL = nil;
static NSURL *SOGoProfileURL = nil;
// static BOOL acceptAnyUser = NO;
static int sogoFirstDayOfWeek = -1;
static int defaultDayStartTime = -1;
@@ -122,10 +122,12 @@ _timeValue (NSString *key)
defaultDayEndTime = 18;
}
if (!AgenorProfileURL)
if (!SOGoProfileURL)
{
profileURL = [ud stringForKey: @"AgenorProfileURL"];
AgenorProfileURL = [[NSURL alloc] initWithString: profileURL];
profileURL = [ud stringForKey: @"SOGoProfileURL"];
if (!profileURL)
profileURL = [ud stringForKey: @"AgenorProfileURL"];
SOGoProfileURL = [[NSURL alloc] initWithString: profileURL];
}
if (!fallbackIMAP4Server)
ASSIGN (fallbackIMAP4Server,
@@ -432,9 +434,9 @@ _timeValue (NSString *key)
{
if (!userDefaults)
userDefaults
= [[AgenorUserDefaults alloc] initWithTableURL: AgenorProfileURL
uid: login
fieldName: @"c_defaults"];
= [[SOGoUserDefaults alloc] initWithTableURL: SOGoProfileURL
uid: login
fieldName: @"c_defaults"];
return userDefaults;
}
@@ -443,9 +445,9 @@ _timeValue (NSString *key)
{
if (!userSettings)
userSettings
= [[AgenorUserDefaults alloc] initWithTableURL: AgenorProfileURL
uid: login
fieldName: @"c_settings"];
= [[SOGoUserDefaults alloc] initWithTableURL: SOGoProfileURL
uid: login
fieldName: @"c_settings"];
return userSettings;
}