LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Lucid fixes for EAS

pull/68/head
Ludovic Marcotte 2014-12-16 10:35:32 -05:00
parent e040805e0d
commit 0f2798f017
3 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ActiveSync/SOGoActiveSyncDispatcher.m
View File

@ -2517,8 +2517,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- (NSURL *) folderTableURL - (NSURL *) folderTableURL
{ {
NSString *urlString, *ocFSTableName; NSMutableString *ocFSTableName;
NSMutableArray *parts; NSMutableArray *parts;
NSString *urlString;
SOGoUser *user; SOGoUser *user;
if (!folderTableURL) if (!folderTableURL)
@ -2537,10 +2538,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
/* If "OCSFolderInfoURL" is properly configured, we must have 5 /* If "OCSFolderInfoURL" is properly configured, we must have 5
parts in this url. We strip the '-' character in case we have parts in this url. We strip the '-' character in case we have
this in the domain part - like foo@bar-zot.com */ this in the domain part - like foo@bar-zot.com */
ocFSTableName = [NSString stringWithFormat: @"sogo_cache_folder_%@", ocFSTableName = [NSMutableString stringWithFormat: @"sogo_cache_folder_%@",
[[[user loginInDomain] asCSSIdentifier] [[user loginInDomain] asCSSIdentifier]];
stringByReplacingOccurrencesOfString: @"-" [ocFSTableName replaceOccurrencesOfString: @"-"
withString: @"_"]]; withString: @"_"
options: 0
range: NSMakeRange(0, [ocFSTableName length])];
[parts replaceObjectAtIndex: 4 withObject: ocFSTableName]; [parts replaceObjectAtIndex: 4 withObject: ocFSTableName];
folderTableURL folderTableURL
= [NSURL URLWithString: [parts componentsJoinedByString: @"/"]]; = [NSURL URLWithString: [parts componentsJoinedByString: @"/"]];

11
NEWS
View File

@ -2,17 +2,18 @@
------------------- -------------------
New features New features
- Allow including or not freebusy info from subscribed calendars - allow including or not freebusy info from subscribed calendars
- Now possible to set an autosave timer for draft messages - now possible to set an autosave timer for draft messages
- Now possible to set alarms on event invitations (#76) - now possible to set alarms on event invitations (#76)
Enhancements Enhancements
- updated CKEditor to version 4.4.6 and added the 'Source Area' plugin - updated CKEditor to version 4.4.6 and added the 'Source Area' plugin
- avoid testing for IMAP ANNOTATION when X-GUID is available (#3018) - avoid testing for IMAP ANNOTATION when X-GUID is available (#3018)
Bug fixes Bug fixes
- Fix for privacy and categories for EAS (#3022) - fix for privacy and categories for EAS (#3022)
- Correctly set MeetingStatus for EAS on iOS devices - correctly set MeetingStatus for EAS on iOS devices
- Ubuntu Lucid fixes for EAS
2.2.11a (2014-12-10) 2.2.11a (2014-12-10)
-------------------- --------------------

20
Tools/SOGoToolManageEAS.m
View File

@ -104,17 +104,17 @@ typedef enum
- (BOOL) run - (BOOL) run
{ {
NSString *userId; NSString *urlString, *deviceId, *userId;
SOGoManageEASCommand cmd; NSMutableString *ocFSTableName;
SOGoCacheGCSObject *oc, *foc; SOGoCacheGCSObject *oc, *foc;
NSString *urlString, *ocFSTableName, *deviceId;
NSURL *folderTableURL; NSURL *folderTableURL;
NSMutableArray *parts; NSMutableArray *parts;
NSArray *entries; NSArray *entries;
id cacheEntry; id cacheEntry;
BOOL rc; SOGoManageEASCommand cmd;
int i, max; int i, max;
BOOL rc;
max = [sanitizedArguments count]; max = [sanitizedArguments count];
rc = NO; rc = NO;
@ -141,10 +141,12 @@ typedef enum
/* If "OCSFolderInfoURL" is properly configured, we must have 5 /* If "OCSFolderInfoURL" is properly configured, we must have 5
parts in this url. We strip the '-' character in case we have parts in this url. We strip the '-' character in case we have
this in the domain part - like foo@bar-zot.com */ this in the domain part - like foo@bar-zot.com */
ocFSTableName = [NSString stringWithFormat: @"sogo_cache_folder_%@", ocFSTableName = [NSMutableString stringWithFormat: @"sogo_cache_folder_%@",
[[[user loginInDomain] asCSSIdentifier] [[user loginInDomain] asCSSIdentifier]];
stringByReplacingOccurrencesOfString: @"-" [ocFSTableName replaceOccurrencesOfString: @"-"
withString: @"_"]]; withString: @"_"
options: 0
range: NSMakeRange(0, [ocFSTableName length])];
[parts replaceObjectAtIndex: 4 withObject: ocFSTableName]; [parts replaceObjectAtIndex: 4 withObject: ocFSTableName];
folderTableURL folderTableURL
= [NSURL URLWithString: [parts componentsJoinedByString: @"/"]]; = [NSURL URLWithString: [parts componentsJoinedByString: @"/"]];