Fix support for SOGoSieveFolderEncoding defaults

Cont'd. Fixes #3904
This commit is contained in:
Francis Lachapelle
2016-12-02 17:38:33 -05:00
parent 6ce64a9a27
commit ba5bd65ea3
7 changed files with 15 additions and 19 deletions
@@ -12,8 +12,7 @@
var vm = this,
sieveCapabilities = $window.sieveCapabilities,
forwardEnabled = $window.forwardEnabled,
vacationEnabled = $window.vacationEnabled,
sieveFolderPathAttribute = ($window.sieveFolderEncoding == "UTF-8") ? "name" : "path";
vacationEnabled = $window.vacationEnabled;
vm.filter = filter;
vm.mailboxes = mailboxes;
@@ -51,12 +50,6 @@
//if (vacationEnabled)
// vm.methodLabels.vacation = l("Send a vacation message");
vm.mailboxes = _.map(mailboxes, function(mailbox) {
return { level: mailbox.level,
name: mailbox.name,
path: mailbox[sieveFolderPathAttribute] };
});
if (sieveCapabilities.indexOf("reject") > -1)
vm.methodLabels.reject = l("Send a reject message");