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

fix(preferences): improve handling of forward addresses 

Fixes #5053
pull/282/head
Francis Lachapelle 2020-06-22 17:12:05 -04:00
parent 2730a91b54
commit 7494bb3ae6
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SoObjects/SOGo/SOGoSieveManager.m
View File

@ -1094,7 +1094,7 @@ static NSString *sieveScriptName = @"sogo";
addresses = [values objectForKey: @"forwardAddress"];
if ([addresses isKindOfClass: [NSString class]])
addresses = [NSArray arrayWithObject: addresses];
addresses = [addresses componentsSeparatedByString: @","];
for (i = 0; i < [addresses count]; i++)
{

11
UI/WebServerResources/js/Preferences/Preferences.service.js
View File

@ -65,8 +65,7 @@
mailAccount.port = null;
});
// We convert our list of autoReplyEmailAddresses/forwardAddress into a string.
// We also convert our date objects into real date, otherwise we'll have strings
// We convert our date objects into real date, otherwise we'll have strings
// or undefined values and the md-datepicker does NOT like this.
if (data.Vacation) {
if (data.Vacation.startDate)
@ -109,8 +108,12 @@
data.Vacation.endDate = new Date();
}
if (data.Forward && angular.isUndefined(data.Forward.forwardAddress))
data.Forward.forwardAddress = [];
if (data.Forward) {
if (angular.isString(data.Forward.forwardAddress))
data.Forward.forwardAddress = data.Forward.forwardAddress.split(/, */);
else if (!angular.isArray(data.Forward.forwardAddress))
data.Forward.forwardAddress = [];
}
// Split calendar categories colors keys and values
if (angular.isUndefined(data.SOGoCalendarCategories))