From 80b0d99687b6f97b89cb9d77684be8e429a6accb Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Thu, 10 Feb 2022 10:03:16 -0500
Subject: [PATCH] fix(preferences(js)): don't check Sieve capabilities if Mail
 module disabled

---
 UI/Templates/PreferencesUI/UIxPreferences.wox                | 2 +-
 .../js/Preferences/PreferencesController.js                  | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/UI/Templates/PreferencesUI/UIxPreferences.wox b/UI/Templates/PreferencesUI/UIxPreferences.wox
index 8dd1b83a8..58f507823 100644
--- a/UI/Templates/PreferencesUI/UIxPreferences.wox
+++ b/UI/Templates/PreferencesUI/UIxPreferences.wox
@@ -23,7 +23,7 @@
     var defaultContactsCategories = <var:string value="defaultContactsCategories" const:escapeHTML="NO"/>;
     var forwardConstraints = <var:string value="forwardConstraints" const:escapeHTML="NO"/>;
     var forwardConstraintsDomains = <var:string value="forwardConstraintsDomains" const:escapeHTML="NO"/>;
-    var sieveCapabilities = <var:string value="sieveCapabilities" const:escapeHTML="NO"/>;
+    <var:if condition="userHasMailAccess"> var sieveCapabilities = <var:string value="sieveCapabilities" const:escapeHTML="NO"/>;</var:if>
   </script>
 
   <script type="text/ng-template" id="preferences.html">
diff --git a/UI/WebServerResources/js/Preferences/PreferencesController.js b/UI/WebServerResources/js/Preferences/PreferencesController.js
index 343764f54..a3014702e 100644
--- a/UI/WebServerResources/js/Preferences/PreferencesController.js
+++ b/UI/WebServerResources/js/Preferences/PreferencesController.js
@@ -16,7 +16,6 @@
       this.passwords = { newPassword: null, newPasswordConfirmation: null, oldPassword: null };
       this.timeZonesList = $window.timeZonesList;
       this.timeZonesSearchText = '';
-      this.sieveVariablesCapability = ($window.sieveCapabilities.indexOf('variables') >= 0);
       this.addressesSearchText = '';
       this.mailLabelKeyRE = new RegExp(/^(?!^_\$)[^(){} %*\"\\\\]*?$/);
       this.emailSeparatorKeys = [
@@ -34,8 +33,10 @@
       if (Preferences.defaults.SOGoAlternateAvatar)
         User.$alternateAvatar = Preferences.defaults.SOGoAlternateAvatar;
 
-      if (sgSettings.activeUser('path').mail)
+      if (sgSettings.activeUser('path').mail) {
+        this.sieveVariablesCapability = ($window.sieveCapabilities.indexOf('variables') >= 0);
         this.preferences.hasActiveExternalSieveScripts();
+      }
       this.updateVacationDates();
     };