From b2b77c65d3d35d7c96986eb0f01c53783e0c6b05 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Tue, 26 Aug 2014 09:00:13 -0400 Subject: [PATCH] Fix folders paths of "sogo-tool restore -l" --- NEWS | 1 + Tools/SOGoToolRestore.m | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index 92bb55872..88637145c 100644 --- a/NEWS +++ b/NEWS @@ -12,6 +12,7 @@ Bug fixes - fixed encoding of new calendars and new subscriptions (JavaScript only) - fixed display of users with no possible subscription - fixed usage of SOGoSubscriptionFolderFormat domain default when the folder's name hasn't been changed + - fixed "sogo-tool restore -l" that was returning incorrect folder IDs 2.2.7 (2014-07-30) ------------------ diff --git a/Tools/SOGoToolRestore.m b/Tools/SOGoToolRestore.m index fe587eeef..d3fb601f9 100644 --- a/Tools/SOGoToolRestore.m +++ b/Tools/SOGoToolRestore.m @@ -558,14 +558,14 @@ typedef enum SOGoToolRestoreMode { if (tables) { NSLog (@"Restorable folders:"); - folderPrefixLen = 1 + [userID length]; - tableKeys = [[tables allKeys] objectEnumerator]; + folderPrefixLen = 8 + [userID length]; // tables keys start with /Users/ + tableKeys = [[[tables allKeys] sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)] objectEnumerator]; while ((key = [tableKeys nextObject])) { currentFolder = [tables objectForKey: key]; folderKey = [key substringFromIndex: folderPrefixLen]; - NSLog (@" '%@': %@", - [currentFolder objectForKey: @"displayname"], folderKey); + NSLog (@" %@ (%@)", + folderKey, [currentFolder objectForKey: @"displayname"]); } } else