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

We now fallback properly on the IMAP server if the Sieve server is undefined.

Browse Source
This commit is contained in:
Ludovic Marcotte
2012-12-05 15:52:50 -05:00
parent ca1a3ac06b
commit 347434dbff
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
SoObjects/SOGo/SOGoSieveManager.m
View File

@@ -647,8 +647,12 @@ static NSString *sieveScriptName = @"sogo";
sieveServer = [[[user mailAccounts] objectAtIndex: 0] objectForKey: @"sieveServerName"];
imapServer = [[[user mailAccounts] objectAtIndex: 0] objectForKey: @"serverName"];
cUrl = [NSURL URLWithString: (sieveServer ? sieveServer : @"") ];
url = [NSURL URLWithString: [dd sieveServer] ];
cUrl = [NSURL URLWithString: (sieveServer ? sieveServer : @"")];
if ([dd sieveServer] && [dd sieveServer].length > 0)
url = [NSURL URLWithString: [dd sieveServer]];
else
url = [NSURL URLWithString: @"localhost"];
if ([cUrl host])
sieveServer = [cUrl host];
@@ -657,7 +661,7 @@ static NSString *sieveScriptName = @"sogo";
if (!sieveServer && [dd sieveServer])
sieveServer = [dd sieveServer];
if (!sieveServer && imapServer)
sieveServer = imapServer;
sieveServer = [[NSURL URLWithString: imapServer] host];
if (!sieveServer)
sieveServer = @"localhost";