LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix(preferences(js)): always apply forward constraints to sieve filters (#294)

pull/295/head
jkanefendt 2021-02-10 20:41:51 +01:00 committed by GitHub
parent 83f1516ca8
commit 59e876d8f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
UI/WebServerResources/js/Preferences/PreferencesController.js
View File

@ -356,10 +356,7 @@
domains = [];
if ($window.forwardConstraints > 0 &&
angular.isDefined(Preferences.defaults.Forward) &&
Preferences.defaults.Forward.enabled &&
angular.isDefined(Preferences.defaults.Forward.forwardAddress)) {
if ($window.forwardConstraints > 0) {
// We first extract the list of 'known domains' to SOGo
defaultAddresses = $window.defaultEmailAddresses;
@ -396,7 +393,8 @@
// We do some sanity checks
// We check if we're allowed or not to forward based on the domain defaults
if (this.preferences.defaults.Forward && this.preferences.defaults.Forward.forwardAddress) {
if (this.preferences.defaults.Forward && this.preferences.defaults.Forward.enabled &&
this.preferences.defaults.Forward.forwardAddress) {
addresses = this.preferences.defaults.Forward.forwardAddress;
try {
for (i = 0; i < addresses.length; i++) {