fix(preferences(js)): always apply forward constraints to sieve filters (#294)
parent
83f1516ca8
commit
59e876d8f7
|
@ -356,10 +356,7 @@
|
||||||
|
|
||||||
domains = [];
|
domains = [];
|
||||||
|
|
||||||
if ($window.forwardConstraints > 0 &&
|
if ($window.forwardConstraints > 0) {
|
||||||
angular.isDefined(Preferences.defaults.Forward) &&
|
|
||||||
Preferences.defaults.Forward.enabled &&
|
|
||||||
angular.isDefined(Preferences.defaults.Forward.forwardAddress)) {
|
|
||||||
|
|
||||||
// We first extract the list of 'known domains' to SOGo
|
// We first extract the list of 'known domains' to SOGo
|
||||||
defaultAddresses = $window.defaultEmailAddresses;
|
defaultAddresses = $window.defaultEmailAddresses;
|
||||||
|
@ -396,7 +393,8 @@
|
||||||
// We do some sanity checks
|
// We do some sanity checks
|
||||||
|
|
||||||
// We check if we're allowed or not to forward based on the domain defaults
|
// 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;
|
addresses = this.preferences.defaults.Forward.forwardAddress;
|
||||||
try {
|
try {
|
||||||
for (i = 0; i < addresses.length; i++) {
|
for (i = 0; i < addresses.length; i++) {
|
||||||
|
|
Loading…
Reference in New Issue