amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-18 01:45:25 +00:00
Code Issues Projects Releases Wiki Activity

BugFix #1046; Whenever the sieve server is unavailable an error message will appear.

Browse Source
This commit is contained in:
Alexandre Cloutier
2014-02-28 16:39:27 -05:00
parent 31ace947cb
commit 1b9ac03e94
3 changed files with 69 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/PreferencesUI/UIxPreferences.m
+36
View File
@@ -1142,6 +1142,7 @@ static NSArray *reminderValues = nil;
id <WOActionResults> results;
WORequest *request;
SOGoDomainDefaults *dd;
<<<<<<< HEAD
NSString *method;
request = [context request];
@@ -1158,6 +1159,23 @@ static NSArray *reminderValues = nil;
if ([dd forwardEnabled])
[userDefaults setForwardOptions: forwardOptions];
=======
SOGoMailAccount *account;
SOGoMailAccounts *folder;
WORequest *request;
request = [context request];
if ([[request method] isEqualToString: @"POST"]){
dd = [[context activeUser] domainDefaults];
if ([dd sieveScriptsEnabled])
[userDefaults setSieveFilters: sieveFilters];
if ([dd vacationEnabled])
[userDefaults setVacationOptions: vacationOptions];
if ([dd forwardEnabled])
[userDefaults setForwardOptions: forwardOptions];
if([self isSieveServerAvailable]){
>>>>>>> a005b93... bug 1046 finished, if sieve server is not responding an error message will appear
[userDefaults synchronize];
folder = [[self clientObject] mailAccountsFolder: @"Mail"
@@ -1165,6 +1183,7 @@ static NSArray *reminderValues = nil;
account = [folder lookupName: @"0" inContext: context acquire: NO];
[account updateFilters];
<<<<<<< HEAD
if (hasChanged)
method = @"window.location.reload()";
else
@@ -1175,6 +1194,23 @@ static NSArray *reminderValues = nil;
else
results = self;
=======
if([account updateFilters]){
results = [self responseWithStatus: 200 andJSONRepresentation: [NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithBool:hasChanged], @"hasChanged", nil]];
}
else{
results = [self responseWithStatus: 502 andJSONRepresentation:[NSDictionary dictionaryWithObjectsAndKeys: @"ConnectionError", @"textStatus", nil]];
}
}
else{
results = [self responseWithStatus: 503 andJSONRepresentation:[NSDictionary dictionaryWithObjectsAndKeys: @"ServiceTemporarilyUnavailable", @"textStatus", nil]];
}
}
else{
results = self;
}
>>>>>>> a005b93... bug 1046 finished, if sieve server is not responding an error message will appear
return results;
}