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
@@ -1791,6 +1791,12 @@ 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)
@@ -320,6 +320,24 @@ _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
+4
View File
@@ -317,6 +317,10 @@ static NSLock *lock = nil;
NSMutableDictionary *currentUser;
NSString *dictPassword;
#if 0
return YES;
#endif
#if defined(THREADSAFE)
[lock lock];
#endif
+11
View File
@@ -282,6 +282,9 @@ static NSArray *childRecordFields = nil;
{
static GCSFolderManager *folderManager = nil;
#if 0
return nil;
#endif
if (!folderManager)
folderManager = [GCSFolderManager defaultFolderManager];
@@ -290,6 +293,10 @@ static NSArray *childRecordFields = nil;
- (GCSFolder *) ocsFolderForPath: (NSString *) _path
{
#if 0
return nil;
#endif
return [[self folderManager] folderAtPath: _path];
}
@@ -352,6 +359,10 @@ static NSArray *childRecordFields = nil;
GCSFolder *folder;
NSString *userLogin;
#if 0
return nil;
#endif
if (!ocsFolder)
{
ocsFolder = [self ocsFolderForPath: [self ocsPath]];
+18
View File
@@ -202,6 +202,10 @@ static SoSecurityManager *sm = nil;
NSURL *folderLocation;
NSString *sql, *gcsFolderType;
#if 0
return;
#endif
cm = [GCSChannelManager defaultChannelManager];
folderLocation
= [[GCSFolderManager defaultFolderManager] folderInfoLocation];
@@ -323,6 +327,20 @@ 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];
+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]];