Fix folders paths of "sogo-tool restore -l"

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)
 ------------------

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/<userID>
+      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