Merge pull request #19 from alexcloutier/fix/2622

BugFix #0002622: The server Dovecot use by default an UTF-8 and by doing...

SoObjects/SOGo/SOGoDefaults.plist

@@ -14,6 +14,7 @@
     SOGoZipPath = "/usr/bin/zip";
 
     SOGoEncryptionKey = "MySOGoEncryptionKey";
+    SOGoSieveFolderEncoding = "UTF-7";
 
     WOUseRelativeURLs = YES;
     WOMessageUseUTF8 = YES;

SoObjects/SOGo/SOGoSystemDefaults.h

@@ -42,6 +42,7 @@
 - (BOOL) trustProxyAuthentication;
 - (NSString *) encryptionKey;
 - (BOOL) useRelativeURLs;
+- (NSString *) sieveFolderEncoding;
 
 - (BOOL) isWebAccessEnabled;
 - (BOOL) isCalendarDAVAccessEnabled;

SoObjects/SOGo/SOGoSystemDefaults.m

@@ -356,6 +356,12 @@ _injectConfigurationFromFile (NSMutableDictionary *defaultsDict,
   return [self boolForKey: @"WOUseRelativeURLs"];
 }
 
+- (NSString *) sieveFolderEncoding
+{
+  return [self stringForKey: @"SOGoSieveFolderEncoding"];
+}
+
+
 - (BOOL) isWebAccessEnabled
 {
   return [self boolForKey: @"SOGoWebAccessEnabled"];

UI/PreferencesUI/UIxFilterEditor.m

@@ -28,6 +28,7 @@
 #import <SOGo/NSString+Utilities.h>
 #import <SOGo/SOGoUser.h>
 #import <SOGo/SOGoUserDefaults.h>
+#import <SOGo/SOGoSystemDefaults.h>
 
 #import <SOGoUI/UIxComponent.h>
 
@@ -35,6 +36,7 @@
 {
   NSString *filterId;
   NSDictionary *labels;
+  NSString *folderEncoding;
 }
 
 @end
@@ -112,4 +114,9 @@
   return [labels jsonRepresentation];
 }
 
+- (NSString *) folderEncoding
+{
+  return [[SOGoSystemDefaults sharedSystemDefaults] folderEncoding];
+}
+
 @end

UI/Templates/PreferencesUI/UIxFilterEditor.wox

@@ -13,6 +13,7 @@
   >
   <script type="text/javascript">
     var filterId = '<var:string value="filterId"/>';
+    var sieveFolderEncoding = '<var:string value="sieveFolderEncoding"/>';
     var mailTags = <var:string value="labels" const:escapeHTML="NO"/>;
   </script>
   <form id="mainForm" var:href="ownPath">

UI/WebServerResources/UIxFilterEditor.js

@@ -635,8 +635,12 @@ function ensureMailboxArgRepresentation(container, argumentSpan) {
                          : {'displayName': 'INBOX', 'path': 'INBOX' });
         for (var i = 0; i < mailboxes.length; i++) {
             var mailbox = mailboxes[i];
+            var folderValue;
+            ((folderEncoding == "UTF-8") ? folderValue = mailbox.displayName
+                                         : folderValue = mailbox.path);
+              
             var mboxOption = createElement("option", null, null,
-                                           { value: mailbox.path }, null, select);
+                                           { value: folderValue }, null, select);
             mboxOption.appendChild(document.createTextNode(mailbox.displayName));
         }
         argumentSpan.appendChild(select);