Monotone-Parent: f2b7fe7c387ac36654ad3e24e68362b3a0a3f2c8

Monotone-Revision: 99c41084c35e71bdf38a8a88897a9ad24b1c0903

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-12-19T16:31:03
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2008-12-19 16:31:03 +00:00
parent 896491a24a
commit 30f3441d14
7 changed files with 204 additions and 12 deletions
+27 -11
View File
@@ -244,17 +244,17 @@ _timeValue (NSString *key)
LDAPUserManager *um;
NSString *realUID;
if (// acceptAnyUser
// ||
[newLogin isEqualToString: @"anonymous"]
|| [newLogin isEqualToString: @"freebusy"])
realUID = newLogin;
else
{
um = [LDAPUserManager sharedUserManager];
realUID = [[um contactInfosForUserWithUIDorEmail: newLogin]
objectForKey: @"c_uid"];
}
// if (// acceptAnyUser
// // ||
// [newLogin isEqualToString: @"anonymous"]
// || [newLogin isEqualToString: @"freebusy"])
// realUID = newLogin;
// else
// {
um = [LDAPUserManager sharedUserManager];
realUID = [[um contactInfosForUserWithUIDorEmail: newLogin]
objectForKey: @"c_uid"];
// }
if ([realUID length])
{
@@ -320,12 +320,19 @@ _timeValue (NSString *key)
- (void) _fetchAllEmails
{
#if 0
allEmails = [NSArray arrayWithObject: @"wsourdeau@inverse.ca"];
#else
allEmails = [self _fetchFieldForUser: @"emails"];
#endif
[allEmails retain];
}
- (void) _fetchCN
{
#if 0
return @"Wolfgang Sourdeau";
#endif
cn = [self _fetchFieldForUser: @"cn"];
[cn retain];
}
@@ -517,6 +524,7 @@ _timeValue (NSString *key)
- (NSString *) language
{
return @"English";
if (!language)
{
language = [[self userDefaults] stringForKey: @"Language"];
@@ -532,6 +540,10 @@ _timeValue (NSString *key)
{
NSString *timeZoneName;
#if 0
return @"UTC";
#endif
if (!userTimeZone)
{
timeZoneName = [[self userDefaults] stringForKey: @"TimeZone"];
@@ -958,6 +970,10 @@ _timeValue (NSString *key)
{
NSString *accessValue;
#if 0
return YES;
#endif
accessValue = [self _fetchFieldForUser:
[NSString stringWithFormat: @"%@Access", module]];