improved handling of SOGoSubscriptionFolderFormat

UI/Common/UIxAclEditor.m

@@ -1,8 +1,6 @@
 /* UIxAclEditor.m - this file is part of SOGo
  *
- * Copyright (C) 2006-2010 Inverse inc.
- *
- * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ * Copyright (C) 2006-2014 Inverse inc.
  *
  * 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
@@ -138,7 +136,7 @@
 - (BOOL) canSubscribeUsers
 {
   return [[self clientObject]
-           respondsToSelector: @selector (subscribeUserOrGroup:reallyDo:)];
+           respondsToSelector: @selector (subscribeUserOrGroup:reallyDo:response:)];
 }
 
 - (BOOL) currentUserIsSubscribed

UI/Common/UIxFolderActions.m

@@ -89,7 +89,10 @@
     }
   else
     {
-      [clientObject subscribeUserOrGroup: login reallyDo: reallyDo];
+      [clientObject subscribeUserOrGroup: login
+                                reallyDo: reallyDo
+                                response: response];
+
       if (isMailInvitation)
         {
           mailInvitationURL
@@ -373,7 +376,8 @@
       max = [userIDs count];
       for (count = 0; count < max; count++)
         [folder subscribeUserOrGroup: [userIDs objectAtIndex: count]
-			    reallyDo: YES];
+			    reallyDo: YES
+                            response: response];
       ex = nil;
     }
   else

UI/MainUI/SOGoUserHomePage.m

@@ -1,8 +1,6 @@
 /* SOGoUserHomePage.m - this file is part of SOGo
  *
- * Copyright (C) 2007-2010 Inverse inc.
- *
- * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ * Copyright (C) 2007-2014 Inverse inc.
  *
  * 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
@@ -447,7 +445,7 @@
   foldersEnum = [folders objectEnumerator];
   while ((currentFolder = [foldersEnum nextObject]))
     [response appendContentString:
-		[currentFolder keysWithFormat: @";%{displayName}:%{name}:%{type}"]];
+		[currentFolder keysWithFormat: @";%{displayName}:%{name}:%{type}:%{formattedName}"]];
 
   return response;
 }

UI/WebServerResources/UIxContactsUserFolders.js

@@ -198,7 +198,9 @@ function addFolderBranchToTree(tree, user, folder, nodeId, subId, isLast) {
     var node = new dTreeNode(subId, nodeId, name, 0, '#', folderId,
                              folderInfos[2] + '-folder', '', '', icon, icon);
     node._ls = isLast;
+
     var content = tree.node(node, (nodeId + subId), null);
+    content._formattedName = folderInfos[3];
 
     return content;
 }
@@ -227,9 +229,7 @@ function onConfirmFolderSelection(event) {
                 folderName = description.replace(/>,.*$/, ">", "g");
             }
             else {
-                var resource = $(topNode.selectedEntry).down("SPAN.nodeName");
-                folderName = resource.innerHTML;
-                folderName = folderName.replace(/>,.*(\))?$/, ">)$1", "g");
+                folderName = node._formattedName;
             }
             var data = { folderName: folderName, folder: folder, type: type, window: window };
             if (parent$(accessToSubscribedFolder(folder)))