From 624172fe9233a26ea4b5d00e00fa0550a6725966 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Wed, 1 Jun 2011 17:54:03 +0000 Subject: [PATCH] See ChangeLog Monotone-Parent: bbd81440c9e99bd7320191a273476ee80fb5b10b Monotone-Revision: ede90c4ec21ca642e49b4287679877bd02717ed6 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2011-06-01T17:54:03 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 6 ++++++ SoObjects/Mailer/SOGoMailAccount.m | 17 +++++++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index aa3c0f813..5143efd79 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-06-01 Francis Lachapelle + + * SoObjects/Mailer/SOGoMailAccount.m (-updateFilters): write + multiple 'redirect' directives when forwarding to multiple email + addresses. + 2011-05-31 Francis Lachapelle * UI/WebServerResources/SchedulerUI.js (initCalendarSelector): use diff --git a/SoObjects/Mailer/SOGoMailAccount.m b/SoObjects/Mailer/SOGoMailAccount.m index 1e91b9c24..df63b8007 100644 --- a/SoObjects/Mailer/SOGoMailAccount.m +++ b/SoObjects/Mailer/SOGoMailAccount.m @@ -358,13 +358,22 @@ static NSString *sieveScriptName = @"sogo"; if (values && [[values objectForKey: @"enabled"] boolValue]) { + id addresses; + int i; + b = YES; - v = [values objectForKey: @"forwardAddress"]; - - if (v && [v length] > 0) - [script appendFormat: @"redirect \"%@\";\r\n", v]; + addresses = [values objectForKey: @"forwardAddress"]; + if ([addresses isKindOfClass: [NSString class]]) + addresses = [NSArray arrayWithObject: addresses]; + for (i = 0; i < [addresses count]; i++) + { + v = [addresses objectAtIndex: i]; + if (v && [v length] > 0) + [script appendFormat: @"redirect \"%@\";\r\n", v]; + } + if ([[values objectForKey: @"keepCopy"] boolValue]) [script appendString: @"keep;\r\n"]; }