mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-05-26 13:55:23 +00:00
Monotone-Parent: ed4c4894c0c554783b39ad526a74404a9cc11e8c
Monotone-Revision: bac00846545ecbaa355017083f8a425f751077c7 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2008-12-19T17:40:42 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
@@ -317,10 +317,6 @@ static NSLock *lock = nil;
|
||||
NSMutableDictionary *currentUser;
|
||||
NSString *dictPassword;
|
||||
|
||||
#if 0
|
||||
return YES;
|
||||
#endif
|
||||
|
||||
#if defined(THREADSAFE)
|
||||
[lock lock];
|
||||
#endif
|
||||
|
||||
@@ -282,9 +282,6 @@ static NSArray *childRecordFields = nil;
|
||||
{
|
||||
static GCSFolderManager *folderManager = nil;
|
||||
|
||||
#if 0
|
||||
return nil;
|
||||
#endif
|
||||
if (!folderManager)
|
||||
folderManager = [GCSFolderManager defaultFolderManager];
|
||||
|
||||
@@ -293,10 +290,6 @@ static NSArray *childRecordFields = nil;
|
||||
|
||||
- (GCSFolder *) ocsFolderForPath: (NSString *) _path
|
||||
{
|
||||
#if 0
|
||||
return nil;
|
||||
#endif
|
||||
|
||||
return [[self folderManager] folderAtPath: _path];
|
||||
}
|
||||
|
||||
@@ -359,10 +352,6 @@ static NSArray *childRecordFields = nil;
|
||||
GCSFolder *folder;
|
||||
NSString *userLogin;
|
||||
|
||||
#if 0
|
||||
return nil;
|
||||
#endif
|
||||
|
||||
if (!ocsFolder)
|
||||
{
|
||||
ocsFolder = [self ocsFolderForPath: [self ocsPath]];
|
||||
|
||||
@@ -202,10 +202,6 @@ static SoSecurityManager *sm = nil;
|
||||
NSURL *folderLocation;
|
||||
NSString *sql, *gcsFolderType;
|
||||
|
||||
#if 0
|
||||
return;
|
||||
#endif
|
||||
|
||||
cm = [GCSChannelManager defaultChannelManager];
|
||||
folderLocation
|
||||
= [[GCSFolderManager defaultFolderManager] folderInfoLocation];
|
||||
@@ -327,20 +323,6 @@ static SoSecurityManager *sm = nil;
|
||||
if (!subFolders)
|
||||
{
|
||||
subFolders = [NSMutableDictionary new];
|
||||
|
||||
#if 0
|
||||
SOGoGCSFolder *folder;
|
||||
if (!subFolderClass)
|
||||
subFolderClass = [[self class] subFolderClass];
|
||||
|
||||
folder = [subFolderClass objectWithName: @"personal" inContainer: self];
|
||||
[folder setDisplayName: [self defaultFolderName]];
|
||||
[folder
|
||||
setOCSPath: [NSString stringWithFormat: @"%@/personal", OCSPath]];
|
||||
[subFolders setObject: folder forKey: @"personal"];
|
||||
return;
|
||||
#endif
|
||||
|
||||
[self appendPersonalSources];
|
||||
[self appendSystemSources];
|
||||
login = [[context activeUser] login];
|
||||
|
||||
@@ -318,19 +318,12 @@ _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];
|
||||
}
|
||||
@@ -522,10 +515,6 @@ _timeValue (NSString *key)
|
||||
|
||||
- (NSString *) language
|
||||
{
|
||||
#if 0
|
||||
return @"English";
|
||||
#endif
|
||||
|
||||
if (!language)
|
||||
{
|
||||
language = [[self userDefaults] stringForKey: @"Language"];
|
||||
@@ -541,10 +530,6 @@ _timeValue (NSString *key)
|
||||
{
|
||||
NSString *timeZoneName;
|
||||
|
||||
#if 0
|
||||
return @"UTC";
|
||||
#endif
|
||||
|
||||
if (!userTimeZone)
|
||||
{
|
||||
timeZoneName = [[self userDefaults] stringForKey: @"TimeZone"];
|
||||
@@ -971,10 +956,6 @@ _timeValue (NSString *key)
|
||||
{
|
||||
NSString *accessValue;
|
||||
|
||||
#if 0
|
||||
return YES;
|
||||
#endif
|
||||
|
||||
accessValue = [self _fetchFieldForUser:
|
||||
[NSString stringWithFormat: @"%@Access", module]];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user