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

merge of '4dead0c3c1d9edc0c48e5bfb39f0ec7a89f28007'

Browse Source 
and '72688cfe86ab1f4b8c8d1f0a9fab23384d7abaab'

Monotone-Parent: 4dead0c3c1d9edc0c48e5bfb39f0ec7a89f28007
Monotone-Parent: 72688cfe86ab1f4b8c8d1f0a9fab23384d7abaab
Monotone-Revision: f84a8ee34fde286386429490ca9126042402c390

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-04-04T14:11:45
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle committed 2011-04-04 14:11:45 +00:00
2 parents c9afeb9827 5ebe3cdd09
commit 02e551d324
8 files changed
+40 -124
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

SoObjects/SOGo/SOGoFolder.m
+1 -1
View File
@@ -1,6 +1,6 @@
/* SOGoFolder.m - this file is part of SOGo
*
* Copyright (C) 2007-2011 Inverse inc.
* Copyright (C) 2007-2009 Inverse inc.
*
* Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
*
SoObjects/SOGo/SOGoGCSFolder.h
+1 -1
View File
@@ -1,6 +1,6 @@
/*
Copyright (C) 2004-2005 SKYRIX Software AG
Copyright (C) 2006-2011 Inverse inc.
Copyright (C) 2006-2010 Inverse inc.
This file is part of SOGo.
SoObjects/SOGo/SOGoGCSFolder.m
+4 -27
View File
@@ -1,7 +1,7 @@
/* SOGoGCSFolder.m - this file is part of SOGo
*
* Copyright (C) 2004-2005 SKYRIX Software AG
* Copyright (C) 2006-2011 Inverse inc.
* Copyright (C) 2006-2010 Inverse inc.
*
* Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
*
@@ -70,7 +70,6 @@
#import "SOGoParentFolder.h"
#import "SOGoPermissions.h"
#import "SOGoUser.h"
#import "SOGoSystemDefaults.h"
#import "SOGoUserDefaults.h"
#import "SOGoUserSettings.h"
#import "SOGoUserManager.h"
@@ -526,34 +525,12 @@ static NSArray *childRecordFields = nil;
}
}
//
// This method honors the SOGoLocalStorageURL preference in order
// to create the database tables at the preferred location instead of
// creating them in the same database as the one specified in the
// OCSFolderInfoURL preference. This is particularly useful for
// multi-sites deployments.
//
- (BOOL) create
{
GCSFolderManager *folderManager;
EOAdaptorChannel *channel;
NSException *result;
NSString *s;
NSURL *url;
folderManager = [self folderManager];
channel = nil;
s = [[SOGoSystemDefaults sharedSystemDefaults] stringForKey: @"SOGoLocalStorageURL"];
url = nil;
if (s)
url = [NSURL URLWithString: s];
result = [folderManager createFolderOfType: [self folderType]
withName: displayName
atPath: ocsPath
andURL: url];
result = [[self folderManager] createFolderOfType: [self folderType]
withName: displayName
atPath: ocsPath];
if (!result
&& [[context request] handledByDefaultHandler])