See ChangeLog
Monotone-Parent: d68444a3c794ab5baa8363ca087ec5caad13ba7b Monotone-Revision: 0b515b8331401536a0de4cc2ca53fce6dd6ca6ed Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2011-07-05T17:40:34 Monotone-Branch: ca.inverse.sogomaint-2.0.2
parent
3abac237a6
commit
c56634f859
|
@ -13,6 +13,10 @@
|
||||||
* SoObjects/SOGo/SOGoSieveManager.m: Added patch from
|
* SoObjects/SOGo/SOGoSieveManager.m: Added patch from
|
||||||
bug #1344 - which fixes Sieve script generation errors
|
bug #1344 - which fixes Sieve script generation errors
|
||||||
for reject filters.
|
for reject filters.
|
||||||
|
* SOPE/GDLContentStore/GCSFolderManager.m (
|
||||||
|
_reallyCreateFolderWithName:andFolderType:...): Fix
|
||||||
|
path handling for recent GNUstep base versions. This
|
||||||
|
fixes bug #1327.
|
||||||
|
|
||||||
2011-07-02 Ludovic Marcotte <lmarcotte@inverse.ca>
|
2011-07-02 Ludovic Marcotte <lmarcotte@inverse.ca>
|
||||||
|
|
||||||
|
|
|
@ -728,15 +728,15 @@ static NSCharacterSet *asciiAlphaNumericCS = nil;
|
||||||
andChannel: (EOAdaptorChannel *) channel
|
andChannel: (EOAdaptorChannel *) channel
|
||||||
atPath: (NSString *) path
|
atPath: (NSString *) path
|
||||||
{
|
{
|
||||||
NSException *error;
|
NSString *baseURL, *tableName, *quickTableName, *aclTableName, *createQuery, *sql;
|
||||||
NSString *baseURL, *tableName, *quickTableName, *aclTableName, *createQuery,
|
GCSSpecialQueries *specialQuery;
|
||||||
*sql;
|
|
||||||
EOAdaptorContext *aContext;
|
EOAdaptorContext *aContext;
|
||||||
NSMutableArray *paths;
|
NSMutableArray *paths;
|
||||||
GCSSpecialQueries *specialQuery;
|
NSException *error;
|
||||||
|
NSRange range;
|
||||||
|
|
||||||
|
paths = [NSMutableArray arrayWithArray: [path componentsSeparatedByString: @"/"]];
|
||||||
|
|
||||||
paths
|
|
||||||
= [NSMutableArray arrayWithArray: [path componentsSeparatedByString: @"/"]];
|
|
||||||
while ([paths count] < 5)
|
while ([paths count] < 5)
|
||||||
[paths addObject: @"NULL"];
|
[paths addObject: @"NULL"];
|
||||||
|
|
||||||
|
@ -747,9 +747,14 @@ static NSCharacterSet *asciiAlphaNumericCS = nil;
|
||||||
quickTableName = [tableName stringByAppendingString: @"_quick"];
|
quickTableName = [tableName stringByAppendingString: @"_quick"];
|
||||||
aclTableName = [tableName stringByAppendingString: @"_acl"];
|
aclTableName = [tableName stringByAppendingString: @"_acl"];
|
||||||
|
|
||||||
// TBD: fix SQL injection issues
|
// TBD: fix SQL injection issues.
|
||||||
baseURL
|
// We no longer call stringByDeletingLastPathComponent since, since GNUstep 1.22,
|
||||||
= [[folderInfoLocation absoluteString] stringByDeletingLastPathComponent];
|
// it'll replace // characters in the URL with /, so mysql:// becomes mysql:/
|
||||||
|
// This is to conform with recent Apple changes.
|
||||||
|
baseURL = [folderInfoLocation absoluteString];
|
||||||
|
range = [baseURL rangeOfString: @"/" options: NSBackwardsSearch];
|
||||||
|
if (range.location != NSNotFound)
|
||||||
|
baseURL = [baseURL substringToIndex: range.location];
|
||||||
|
|
||||||
sql = [NSString stringWithFormat: @"INSERT INTO %@"
|
sql = [NSString stringWithFormat: @"INSERT INTO %@"
|
||||||
@" (c_path, c_path1, c_path2, c_path3, c_path4,"
|
@" (c_path, c_path1, c_path2, c_path3, c_path4,"
|
||||||
|
|
Loading…
Reference in New Issue