amorfo77/sogo
1
0 Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-10-11 23:07:12 +00:00
Code Issues Projects Releases Wiki Activity

See ChangeLog

Browse Source 
Monotone-Parent: ef0aa48a6604ad9c6048a42d79be6779460dcd1a
Monotone-Revision: 485b2bbaa9cf22a075daa65673c3fac7256a86e4

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2009-02-24T01:54:59
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Ludovic Marcotte committed 2009-02-24 01:54:59 +00:00
1 parent 5605ebc668
commit 282be5d22b
20 files changed
+401 -320
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

SoObjects/SOGo/SOGoUser.m
+45 -47
View File
@@ -23,11 +23,13 @@
#import <Foundation/NSArray.h>
#import <Foundation/NSCalendarDate.h>
#import <Foundation/NSDictionary.h>
#import <Foundation/NSDistributedNotificationCenter.h>
#import <Foundation/NSEnumerator.h>
#import <Foundation/NSNull.h>
#import <Foundation/NSTimeZone.h>
#import <Foundation/NSUserDefaults.h>
#import <Foundation/NSValue.h>
#import <Foundation/NSURL.h>
#import <NGObjWeb/WOApplication.h>
#import <NGObjWeb/WOContext.h>
#import <NGObjWeb/WORequest.h>
@@ -330,20 +332,6 @@ _timeValue (NSString *key)
}
/* properties */
// - (NSString *) fullEmail
// {
// return [[LDAPUserManager sharedUserManager] getFullEmailForUID: login];
// }
// - (NSString *) primaryEmail
// {
// if (!allEmails)
// [self _fetchAllEmails];
// return [allEmails objectAtIndex: 0];
// }
- (NSArray *) allEmails
{
if (!allEmails)
@@ -415,26 +403,6 @@ _timeValue (NSString *key)
@" variable(s) mentionned above are configured"];
}
// - (NSString *) primaryMailServer
// {
// return [[self userManager] getServerForUID: [self login]];
// }
// - (NSArray *) additionalIMAP4AccountStrings
// {
// return [[self userManager]getSharedMailboxAccountStringsForUID: [self login]];
// }
// - (NSArray *) additionalEMailAddresses
// {
// return [[self userManager] getSharedMailboxEMailsForUID: [self login]];
// }
// - (NSDictionary *) additionalIMAP4AccountsAndEMails
// {
// return [[self userManager] getSharedMailboxesAndEMailsForUID: [self login]];
// }
- (NSURL *) freeBusyURL
{
return nil;
@@ -491,15 +459,16 @@ _timeValue (NSString *key)
- (NSUserDefaults *) userDefaults
{
SOGoUserDefaults *defaults;
NSDictionary *cachedDefaults;
cachedDefaults = [[SOGoCache cachedUserDefaults] objectForKey: login];
if (cachedDefaults)
defaults = [cachedDefaults objectForKey: @"dictionary"];
else
defaults = [[SOGoCache sharedCache] userDefaultsForLogin: login];
if (!defaults)
{
NSMutableDictionary *d;
defaults = [self primaryUserDefaults];
/* Required parameters for the web interface */
// Required parameters for the Web interface
if (![[defaults stringForKey: @"ReplyPlacement"] length])
[defaults setObject: defaultReplyPlacement forKey: @"ReplyPlacement"];
if (![[defaults stringForKey: @"SignaturePlacement"] length])
@@ -509,8 +478,22 @@ _timeValue (NSString *key)
if (![[defaults stringForKey: @"MessageCheck"] length])
[defaults setObject: defaultMessageCheck forKey: @"MessageCheck"];
[SOGoCache setCachedUserDefaults: defaults user: login];
// We propagate the loaded user defaults to other sogod instances
// which will cache them in SOGoCache (including for the instance
// that actually posts the notification)
d = [NSMutableDictionary dictionary];
[d setObject: [defaults values] forKey: @"values"];
[d setObject: login forKey: @"uid"];
[d setObject: [SOGoProfileURL absoluteString] forKey: @"url"];
[[NSDistributedNotificationCenter defaultCenter]
postNotificationName: @"SOGoUserDefaultsHaveLoaded"
object: nil
userInfo: d
deliverImmediately: YES];
}
//else
// NSLog(@"User defaults cache hit for %@", login);
return (NSUserDefaults *) defaults;
}
@@ -518,16 +501,31 @@ _timeValue (NSString *key)
- (NSUserDefaults *) userSettings
{
SOGoUserDefaults *settings;
NSDictionary *cachedSettings;
cachedSettings = [[SOGoCache cachedUserSettings] objectForKey: login];
if (cachedSettings)
settings = [cachedSettings objectForKey: @"dictionary"];
else
settings = [[SOGoCache sharedCache] userSettingsForLogin: login];
if (!settings)
{
NSMutableDictionary *d;
settings = [self primaryUserSettings];
[SOGoCache setCachedUserSettings: settings user: login];
[settings fetchProfile];
// We propagate the loaded user settings to other sogod instances
// which will cache them in SOGoCache (including for the instance
// that actually posts the notification)
d = [NSMutableDictionary dictionary];
[d setObject: [settings values] forKey: @"values"];
[d setObject: login forKey: @"uid"];
[d setObject: [SOGoProfileURL absoluteString] forKey: @"url"];
[[NSDistributedNotificationCenter defaultCenter]
postNotificationName: @"SOGoUserSettingsHaveLoaded"
object: nil
userInfo: d
deliverImmediately: YES];
}
//else
// NSLog(@"User settings cache hit for %@", login);
return (NSUserDefaults *) settings;
}