From e7f39264684513535389b721663c9f811fe2774e Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Fri, 19 Dec 2008 17:40:42 +0000 Subject: [PATCH] Monotone-Parent: ed4c4894c0c554783b39ad526a74404a9cc11e8c Monotone-Revision: bac00846545ecbaa355017083f8a425f751077c7 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2008-12-19T17:40:42 Monotone-Branch: ca.inverse.sogo --- Main/SOGo.m | 120 +----------------- .../Appointments/SOGoAppointmentFolder.m | 6 - .../Appointments/SOGoCalendarComponent.m | 18 --- SoObjects/SOGo/LDAPUserManager.m | 4 - SoObjects/SOGo/SOGoGCSFolder.m | 11 -- SoObjects/SOGo/SOGoParentFolder.m | 18 --- SoObjects/SOGo/SOGoUser.m | 19 --- 7 files changed, 1 insertion(+), 195 deletions(-) diff --git a/Main/SOGo.m b/Main/SOGo.m index 4cd6dd1d5..877e389f7 100644 --- a/Main/SOGo.m +++ b/Main/SOGo.m @@ -19,13 +19,9 @@ 02111-1307, USA. */ -// #import -// #import - #import #import #import -// #import #import #import #import @@ -61,102 +57,6 @@ #import "SOGoProductLoader.h" #import "NSException+Stacktrace.h" -// static NSMutableDictionary *debugCache = nil; - -// static NSMutableArray *debugCache = nil; - -// @interface GSMutableArray : NSArray; -// @end - -// @interface GSMutableArray (sogodebug) -// @end - -// @implementation GSMutableArray (sogodebug) - -// + (id) alloc -// { -// static BOOL avoid = NO; -// id newInst; - -// newInst = [super alloc]; -// if (!avoid) -// { -// avoid = YES; -// if (!debugCache) -// debugCache = [NSMutableArray new]; -// [debugCache addObject: [NSValue valueWithPointer: newInst]]; -// } - -// return newInst; -// } - -// - (id) retain -// { -// NSNumber *nbr; -// id this; -// static BOOL avoid = NO; - -// fprintf (stderr, "retain start (%p)\n", self); - -// if (avoid) -// this = [super retain]; -// else -// { -// avoid = YES; -// if (!debugCache) -// debugCache = [NSMutableArray new]; -// nbr = [debugCache objectForKey: self]; -// nbr = [NSNumber numberWithInt: ([nbr intValue] + 1)]; -// [debugCache setObject: nbr forKey: self]; -// this = [super retain]; -// avoid = NO; -// } - -// fprintf (stderr, "retain stop (%p)\n", self); - -// return this; -// } - -// - (void) release -// { -// NSNumber *nbr; -// int count; -// static BOOL avoid = NO; - -// fprintf (stderr, "release start (%p)\n", self); - -// if (avoid) -// [super release]; -// else -// { -// avoid = YES; - -// nbr = [debugCache objectForKey: self]; -// if (nbr) -// { -// count = [nbr intValue]; -// if (count == 2) -// { -// [debugCache removeObjectForKey: self]; -// fprintf (stderr, "removing object\n"); -// } -// else -// { -// nbr = [NSNumber numberWithInt: (count - 1)]; -// [debugCache setObject: nbr forKey: self]; -// fprintf (stderr, "decrementing counter\n"); -// } -// } -// [super release]; - -// avoid = NO; -// } - -// fprintf (stderr, "release stop (%p)\n", self); -// } - -// @end - @interface SOGo : SoApplication { NSMutableDictionary *localeLUT; @@ -330,10 +230,6 @@ static BOOL debugObjectAllocation = NO; NSUserDefaults *ud; BOOL ok; -#if 0 - return YES; -#endif - ud = [NSUserDefaults standardUserDefaults]; ok = YES; cm = [GCSChannelManager defaultChannelManager]; @@ -446,7 +342,7 @@ static BOOL debugObjectAllocation = NO; #endif /* put locale info into the context in case it's not there */ [self _setupLocaleInContext:_ctx]; - + /* first check attributes directly bound to the application */ obj = [super lookupName:_key inContext:_ctx acquire:_flag]; if (!obj) @@ -515,8 +411,6 @@ static BOOL debugObjectAllocation = NO; WOResponse *resp; NSDate *startDate, *endDate; -// NSAutoreleasePool *pool; - if (debugRequests) { [self logWithFormat: @"starting method '%@' on uri '%@'", @@ -524,22 +418,10 @@ static BOOL debugObjectAllocation = NO; startDate = [NSDate date]; } -// GSDebugAllocationActive (YES); -// GSDebugAllocationList (NO); - -// pool = [NSAutoreleasePool new]; - cache = [SOGoCache sharedCache]; resp = [super dispatchRequest: _request]; [SOGoCache killCache]; -// [resp retain]; -// [pool release]; -// [resp autorelease]; - -// NSLog (@"objects:\n%s\n", GSDebugAllocationList (YES)); -// GSDebugAllocationActive (NO); - if (debugRequests) { endDate = [NSDate date]; diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m index 3433d2835..34640173b 100644 --- a/SoObjects/Appointments/SOGoAppointmentFolder.m +++ b/SoObjects/Appointments/SOGoAppointmentFolder.m @@ -1791,12 +1791,6 @@ static Class sogoAppointmentFolderKlass = Nil; NSString *url; BOOL handledLater; -#if 0 - obj = [SOGoAppointmentObject objectWithName: _key - inContainer: self]; - return obj; -#endif - /* first check attributes directly bound to the application */ handledLater = [self requestNamedIsHandledLater: _key]; if (handledLater) diff --git a/SoObjects/Appointments/SOGoCalendarComponent.m b/SoObjects/Appointments/SOGoCalendarComponent.m index a517917f0..9c97303d4 100644 --- a/SoObjects/Appointments/SOGoCalendarComponent.m +++ b/SoObjects/Appointments/SOGoCalendarComponent.m @@ -320,24 +320,6 @@ _occurenceHasID (iCalRepeatableEntityObject *occurence, NSString *recID) { NSString *secureContent; -#if 0 - return (@"BEGIN:VCALENDAR\r\n" - @"VERSION:2.0\r\n" - @"PRODID:-//Inverse inc.//SOGo0.9//EN\r\n" - @"BEGIN:VEVENT\r\n" - @"UID:3185-492B0B80-5-BA4E3100\r\n" - @"SUMMARY:test event\r\n" - @"CREATED:20081124T201510Z\r\n" - @"DTSTAMP:20081124T201510Z\r\n" - @"LAST-MODIFIED:20081126T015646Z\r\n" - @"DTSTART:20081127T150000Z\r\n" - @"DTEND:20081127T160000Z\r\n" - @"TRANSP:OPAQUE\r\n" - @"RRULE:INTERVAL=1;FREQ=WEEKLY\r\n" - @"END:VEVENT\r\n" - @"END:VCALENDAR"); -#endif - if ([[context request] isSoWebDAVRequest]) secureContent = [self secureContentAsString]; else diff --git a/SoObjects/SOGo/LDAPUserManager.m b/SoObjects/SOGo/LDAPUserManager.m index fd4886f9a..f0f6f7b56 100644 --- a/SoObjects/SOGo/LDAPUserManager.m +++ b/SoObjects/SOGo/LDAPUserManager.m @@ -317,10 +317,6 @@ static NSLock *lock = nil; NSMutableDictionary *currentUser; NSString *dictPassword; -#if 0 - return YES; -#endif - #if defined(THREADSAFE) [lock lock]; #endif diff --git a/SoObjects/SOGo/SOGoGCSFolder.m b/SoObjects/SOGo/SOGoGCSFolder.m index 882194988..21d0176d7 100644 --- a/SoObjects/SOGo/SOGoGCSFolder.m +++ b/SoObjects/SOGo/SOGoGCSFolder.m @@ -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]]; diff --git a/SoObjects/SOGo/SOGoParentFolder.m b/SoObjects/SOGo/SOGoParentFolder.m index 42fa919df..78496dc93 100644 --- a/SoObjects/SOGo/SOGoParentFolder.m +++ b/SoObjects/SOGo/SOGoParentFolder.m @@ -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]; diff --git a/SoObjects/SOGo/SOGoUser.m b/SoObjects/SOGo/SOGoUser.m index 74d28fc76..c9c6a1322 100644 --- a/SoObjects/SOGo/SOGoUser.m +++ b/SoObjects/SOGo/SOGoUser.m @@ -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]];