Merge pull request #131 from Zentyal/ejhernandez/set-restriction-on-name-for-mail-folders
oc-mail: Support restricitions on name for MAPIStoreMailFolderTable
This commit is contained in:
commit
92ab267db5
|
@ -100,6 +100,7 @@ $(SOGOBACKEND)_OBJC_FILES += \
|
||||||
MAPIStoreMailAttachment.m \
|
MAPIStoreMailAttachment.m \
|
||||||
MAPIStoreMailContext.m \
|
MAPIStoreMailContext.m \
|
||||||
MAPIStoreMailFolder.m \
|
MAPIStoreMailFolder.m \
|
||||||
|
MAPIStoreMailFolderTable.m \
|
||||||
MAPIStoreMailMessage.m \
|
MAPIStoreMailMessage.m \
|
||||||
MAPIStoreMailVolatileMessage.m \
|
MAPIStoreMailVolatileMessage.m \
|
||||||
MAPIStoreMailMessageTable.m \
|
MAPIStoreMailMessageTable.m \
|
||||||
|
|
|
@ -52,6 +52,7 @@
|
||||||
#import "MAPIStoreFAIMessage.h"
|
#import "MAPIStoreFAIMessage.h"
|
||||||
#import "MAPIStoreMailContext.h"
|
#import "MAPIStoreMailContext.h"
|
||||||
#import "MAPIStoreMailMessage.h"
|
#import "MAPIStoreMailMessage.h"
|
||||||
|
#import "MAPIStoreMailFolderTable.h"
|
||||||
#import "MAPIStoreMailMessageTable.h"
|
#import "MAPIStoreMailMessageTable.h"
|
||||||
#import "MAPIStoreMapping.h"
|
#import "MAPIStoreMapping.h"
|
||||||
#import "MAPIStoreTypes.h"
|
#import "MAPIStoreTypes.h"
|
||||||
|
@ -154,6 +155,11 @@ static Class SOGoMailFolderK, MAPIStoreMailFolderK, MAPIStoreOutboxFolderK;
|
||||||
return [MAPIStoreMailMessageTable tableForContainer: self];
|
return [MAPIStoreMailMessageTable tableForContainer: self];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
- (MAPIStoreFolderTable *) folderTable
|
||||||
|
{
|
||||||
|
return [MAPIStoreMailFolderTable tableForContainer: self];
|
||||||
|
}
|
||||||
|
|
||||||
- (enum mapistore_error) createFolder: (struct SRow *) aRow
|
- (enum mapistore_error) createFolder: (struct SRow *) aRow
|
||||||
withFID: (uint64_t) newFID
|
withFID: (uint64_t) newFID
|
||||||
andKey: (NSString **) newKeyP
|
andKey: (NSString **) newKeyP
|
||||||
|
@ -359,12 +365,17 @@ static Class SOGoMailFolderK, MAPIStoreMailFolderK, MAPIStoreOutboxFolderK;
|
||||||
- (NSArray *) folderKeysMatchingQualifier: (EOQualifier *) qualifier
|
- (NSArray *) folderKeysMatchingQualifier: (EOQualifier *) qualifier
|
||||||
andSortOrderings: (NSArray *) sortOrderings
|
andSortOrderings: (NSArray *) sortOrderings
|
||||||
{
|
{
|
||||||
|
NSArray *filteredSubfolderKeys;
|
||||||
NSMutableArray *subfolderKeys;
|
NSMutableArray *subfolderKeys;
|
||||||
|
NSMutableArray *subfolderKeysQualifying;
|
||||||
|
NSString *subfolderKey;
|
||||||
|
NSUInteger count, max;
|
||||||
|
|
||||||
if ([self ensureFolderExists])
|
if ([self ensureFolderExists])
|
||||||
{
|
{
|
||||||
|
/* Only folder name can be used as qualifier key */
|
||||||
if (qualifier)
|
if (qualifier)
|
||||||
[self errorWithFormat: @"qualifier is not used for folders"];
|
[self warnWithFormat: @"qualifier is only used for folders with name"];
|
||||||
if (sortOrderings)
|
if (sortOrderings)
|
||||||
[self errorWithFormat: @"sort orderings are not used for folders"];
|
[self errorWithFormat: @"sort orderings are not used for folders"];
|
||||||
|
|
||||||
|
@ -372,6 +383,31 @@ static Class SOGoMailFolderK, MAPIStoreMailFolderK, MAPIStoreOutboxFolderK;
|
||||||
[subfolderKeys autorelease];
|
[subfolderKeys autorelease];
|
||||||
|
|
||||||
[self _cleanupSubfolderKeys: subfolderKeys];
|
[self _cleanupSubfolderKeys: subfolderKeys];
|
||||||
|
|
||||||
|
if (qualifier)
|
||||||
|
{
|
||||||
|
subfolderKeysQualifying = [NSMutableArray array];
|
||||||
|
max = [subfolderKeys count];
|
||||||
|
for (count = 0; count < max; count++) {
|
||||||
|
subfolderKey = [subfolderKeys objectAtIndex: count];
|
||||||
|
/* Remove "folder" prefix */
|
||||||
|
subfolderKey = [subfolderKey substringFromIndex: 6];
|
||||||
|
subfolderKey = [[subfolderKey fromCSSIdentifier] stringByDecodingImap4FolderName];
|
||||||
|
[subfolderKeysQualifying addObject: [NSDictionary dictionaryWithObject: subfolderKey
|
||||||
|
forKey: @"name"]];
|
||||||
|
}
|
||||||
|
filteredSubfolderKeys = [subfolderKeysQualifying filteredArrayUsingQualifier: qualifier];
|
||||||
|
|
||||||
|
max = [filteredSubfolderKeys count];
|
||||||
|
subfolderKeys = [NSMutableArray arrayWithCapacity: max];
|
||||||
|
for (count = 0; count < max; count++)
|
||||||
|
{
|
||||||
|
subfolderKey = [[filteredSubfolderKeys objectAtIndex: count] valueForKey: @"name"];
|
||||||
|
subfolderKey = [NSString stringWithFormat: @"folder%@", [[subfolderKey stringByEncodingImap4FolderName] asCSSIdentifier]];
|
||||||
|
[subfolderKeys addObject: subfolderKey];
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
subfolderKeys = nil;
|
subfolderKeys = nil;
|
||||||
|
|
31
OpenChange/MAPIStoreMailFolderTable.h
Normal file
31
OpenChange/MAPIStoreMailFolderTable.h
Normal file
|
@ -0,0 +1,31 @@
|
||||||
|
/* MAPIStoreMailFolderTable.h - this file is part of SOGo
|
||||||
|
*
|
||||||
|
* Copyright (C) 2015 Enrique J. Hernández
|
||||||
|
*
|
||||||
|
* Author: Enrique J. Hernández <ejhernandez@zentyal.com>
|
||||||
|
*
|
||||||
|
* This file is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation; either version 3, or (at your option)
|
||||||
|
* any later version.
|
||||||
|
*
|
||||||
|
* This file is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; see the file COPYING. If not, write to
|
||||||
|
* the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||||
|
* Boston, MA 02111-1307, USA.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef MAPISTOREMAILFOLDERTABLE_H
|
||||||
|
#define MAPISTOREMAILFOLDERTABLE_H
|
||||||
|
|
||||||
|
#import "MAPIStoreFolderTable.h"
|
||||||
|
|
||||||
|
@interface MAPIStoreMailFolderTable : MAPIStoreFolderTable
|
||||||
|
@end
|
||||||
|
|
||||||
|
#endif /* MAPISTOREMAILFOLDERTABLE_H */
|
42
OpenChange/MAPIStoreMailFolderTable.m
Normal file
42
OpenChange/MAPIStoreMailFolderTable.m
Normal file
|
@ -0,0 +1,42 @@
|
||||||
|
/* MAPIStoreMailFolderTable.m - this file is part of SOGo
|
||||||
|
*
|
||||||
|
* Copyright (C) 2015 Enrique J. Hernández
|
||||||
|
*
|
||||||
|
* This file is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation; either version 3, or (at your option)
|
||||||
|
* any later version.
|
||||||
|
*
|
||||||
|
* This file is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; see the file COPYING. If not, write to
|
||||||
|
* the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||||
|
* Boston, MA 02111-1307, USA.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#import <Foundation/NSString.h>
|
||||||
|
|
||||||
|
#import "MAPIStoreMailFolderTable.h"
|
||||||
|
#import "MAPIStoreTypes.h"
|
||||||
|
|
||||||
|
@implementation MAPIStoreMailFolderTable
|
||||||
|
|
||||||
|
- (NSString *) backendIdentifierForProperty: (enum MAPITAGS) property
|
||||||
|
{
|
||||||
|
switch(property)
|
||||||
|
{
|
||||||
|
case PR_DISPLAY_NAME:
|
||||||
|
case PR_DISPLAY_NAME_UNICODE:
|
||||||
|
return @"name";
|
||||||
|
default:
|
||||||
|
return nil;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@end
|
||||||
|
|
Loading…
Reference in a new issue