Change the variable name for sieveFolderEncoding instead of folderEncoding

pull/19/head
Alexandre Cloutier 2014-03-10 10:07:47 -04:00
parent e7a16cba0d
commit f8939bfb3e
4 changed files with 5 additions and 5 deletions

View File

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

View File

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

View File

@ -356,9 +356,9 @@ _injectConfigurationFromFile (NSMutableDictionary *defaultsDict,
return [self boolForKey: @"WOUseRelativeURLs"]; return [self boolForKey: @"WOUseRelativeURLs"];
} }
- (NSString *) folderEncoding - (NSString *) sieveFolderEncoding
{ {
return [self stringForKey: @"SOGoFolderEncoding"]; return [self stringForKey: @"SOGoSieveFolderEncoding"];
} }

View File

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