From eff8ab3e0e62857daf37da129d3928c3e9f7cde1 Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Tue, 9 Feb 2016 14:15:23 -0500
Subject: [PATCH] (fix) don't offer forward/vacation options in filters if not
 enabled

---
 NEWS                                                |  1 +
 UI/PreferencesUI/UIxPreferences.h                   |  6 ++----
 UI/PreferencesUI/UIxPreferences.m                   |  6 ++++++
 UI/Templates/PreferencesUI/UIxPreferences.wox       |  2 ++
 .../js/Preferences/FiltersDialogController.js       | 13 ++++++++++---
 5 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/NEWS b/NEWS
index ff2249355..4d7f8c4bc 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@
 Enhancements
  - [web] added Junk handling feature from v2
  - [web] updated Material Icons font to version 2.1.3
+ - [web] don't offer forward/vacation options in filters if not enabled
 
 Bug fixes
  - [web] handle birthday dates before 1970
diff --git a/UI/PreferencesUI/UIxPreferences.h b/UI/PreferencesUI/UIxPreferences.h
index a57cf405d..dd3a00862 100644
--- a/UI/PreferencesUI/UIxPreferences.h
+++ b/UI/PreferencesUI/UIxPreferences.h
@@ -1,6 +1,6 @@
 /* UIxPreferences.h - this file is part of SOGo
  *
- * Copyright (C) 2007-2015 Inverse inc.
+ * Copyright (C) 2007-2016 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
@@ -51,12 +51,10 @@
   NSMutableDictionary *vacationOptions, *forwardOptions;
 
   BOOL mailCustomFromEnabled;
+  BOOL forwardEnabled;
   BOOL hasChanged;
-
-  
 }
 
-//- (NSString *) userLongDateFormat;
 - (BOOL) _isSieveServerAvailable;
 - (id) _sieveClient;
 
diff --git a/UI/PreferencesUI/UIxPreferences.m b/UI/PreferencesUI/UIxPreferences.m
index 958634f29..d640fe4f2 100644
--- a/UI/PreferencesUI/UIxPreferences.m
+++ b/UI/PreferencesUI/UIxPreferences.m
@@ -144,6 +144,7 @@ static NSArray *reminderValues = nil;
 	}
 
       mailCustomFromEnabled = [dd mailCustomFromEnabled];
+      forwardEnabled = [dd forwardEnabled];
 
       hasChanged = NO;
     }
@@ -2079,6 +2080,11 @@ static NSArray *reminderValues = nil;
   return (mailCustomFromEnabled ? @"true" : @"false");
 }
 
+- (NSString *) forwardEnabled
+{
+  return (forwardEnabled ? @"true" : @"false");
+}
+
 //
 //
 //
diff --git a/UI/Templates/PreferencesUI/UIxPreferences.wox b/UI/Templates/PreferencesUI/UIxPreferences.wox
index 10ef35d0b..57d751225 100644
--- a/UI/Templates/PreferencesUI/UIxPreferences.wox
+++ b/UI/Templates/PreferencesUI/UIxPreferences.wox
@@ -15,6 +15,8 @@
 
   <script type="text/javascript">
     var mailCustomFromEnabled = <var:string value="mailCustomFromEnabled" const:escapeHTML="NO"/>;
+    var forwardEnabled = <var:string value="forwardEnabled" const:escapeHTML="NO"/>;
+    var vacationEnabled = <var:string value="isVacationEnabled" const:escapeHTML="NO"/>;
     var timeZonesList = <var:string value="timeZonesList" const:escapeHTML="NO"/>;
     var defaultEmailAddresses = '<var:string value="defaultEmailAddresses" const:escapeHTML="NO"/>';
     var forwardConstraints = <var:string value="forwardConstraints" const:escapeHTML="NO"/>;
diff --git a/UI/WebServerResources/js/Preferences/FiltersDialogController.js b/UI/WebServerResources/js/Preferences/FiltersDialogController.js
index f2b1e3fe9..fe14ca333 100644
--- a/UI/WebServerResources/js/Preferences/FiltersDialogController.js
+++ b/UI/WebServerResources/js/Preferences/FiltersDialogController.js
@@ -9,7 +9,10 @@
    */
   FiltersDialogController.$inject = ['$scope', '$window', '$mdDialog', 'filter', 'mailboxes', 'labels'];
   function FiltersDialogController($scope, $window, $mdDialog, filter, mailboxes, labels) {
-    var vm = this, sieveCapabilities = $window.sieveCapabilities;
+    var vm = this,
+        sieveCapabilities = $window.sieveCapabilities,
+        forwardEnabled = $window.forwardEnabled,
+        vacationEnabled = $window.vacationEnabled;
 
     vm.filter = filter;
     vm.mailboxes = mailboxes;
@@ -37,11 +40,15 @@
     vm.methodLabels = {
       "discard": l("Discard the message"),
       "keep": l("Keep the message"),
-      "redirect": l("Forward the message to"),
-      "vacation": l("Send a vacation message"),
       "stop": l("Stop processing filter rules")
     };
 
+    if (forwardEnabled)
+      vm.methodLabels.redirect = l("Forward the message to");
+
+    if (vacationEnabled)
+      vm.methodLabels.vacation = l("Send a vacation message");
+
     if (sieveCapabilities.indexOf("reject") > -1)
       vm.methodLabels.reject = l("Send a reject message");