amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-21 03:15:25 +00:00
Code Issues Projects Releases Wiki Activity

fix(preferences(js)): don't check Sieve capabilities if Mail module disabled

Browse Source
This commit is contained in:
Francis Lachapelle
2022-02-10 10:03:16 -05:00
parent 3847b57855
commit 80b0d99687
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/Templates/PreferencesUI/UIxPreferences.wox
+1 -1
View File
@@ -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">
UI/WebServerResources/js/Preferences/PreferencesController.js
+3 -2
View File
@@ -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();
};