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

Erase the merging conflicts writings

Browse source
This commit is contained in:
Alexandre Cloutier 2014-03-06 15:20:41 -05:00
parent e24c22e3dc
commit 342b68fd44
3 changed files with 6 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
UI/PreferencesUI/English.lproj/Localizable.strings
View file

@ -252,11 +252,8 @@
"Active" = "Active"; "Active" = "Active";
"Move Up" = "Move Up"; "Move Up" = "Move Up";
"Move Down" = "Move Down"; "Move Down" = "Move Down";
<<<<<<< HEAD
=======
"ConnectionError" = "Connection error"; "ConnectionError" = "Connection error";
"ServiceTemporarilyUnavailable" = "Service temporarily unavailable"; "ServiceTemporarilyUnavailable" = "Service temporarily unavailable";
>>>>>>> a005b93... bug 1046 finished, if sieve server is not responding an error message will appear
/* Filters - UIxFilterEditor */ /* Filters - UIxFilterEditor */
"Filter name:" = "Filter name:"; "Filter name:" = "Filter name:";

47
UI/PreferencesUI/UIxPreferences.m
View file

@ -1225,61 +1225,27 @@ static NSArray *reminderValues = nil;
- (id <WOActionResults>) defaultAction - (id <WOActionResults>) defaultAction
{ {
id <WOActionResults> results; id <WOActionResults> results;
WORequest *request;
SOGoDomainDefaults *dd; SOGoDomainDefaults *dd;
<<<<<<< HEAD
NSString *method;
request = [context request];
if ([[request method] isEqualToString: @"POST"])
{
SOGoMailAccount *account;
SOGoMailAccounts *folder;
dd = [[context activeUser] domainDefaults];
if ([dd sieveScriptsEnabled])
[userDefaults setSieveFilters: sieveFilters];
if ([dd vacationEnabled])
[userDefaults setVacationOptions: vacationOptions];
if ([dd forwardEnabled])
[userDefaults setForwardOptions: forwardOptions];
=======
SOGoMailAccount *account; SOGoMailAccount *account;
SOGoMailAccounts *folder; SOGoMailAccounts *folder;
WORequest *request; WORequest *request;
request = [context request]; request = [context request];
if ([[request method] isEqualToString: @"POST"]){ if ([[request method] isEqualToString: @"POST"]){
dd = [[context activeUser] domainDefaults]; dd = [[context activeUser] domainDefaults];
if ([dd sieveScriptsEnabled]) if ([dd sieveScriptsEnabled])
[userDefaults setSieveFilters: sieveFilters]; [userDefaults setSieveFilters: sieveFilters];
if ([dd vacationEnabled]) if ([dd vacationEnabled])
[userDefaults setVacationOptions: vacationOptions]; [userDefaults setVacationOptions: vacationOptions];
if ([dd forwardEnabled]) if ([dd forwardEnabled])
[userDefaults setForwardOptions: forwardOptions]; [userDefaults setForwardOptions: forwardOptions];
if([self isSieveServerAvailable]){ if([self isSieveServerAvailable]){
>>>>>>> a005b93... bug 1046 finished, if sieve server is not responding an error message will appear
[userDefaults synchronize]; [userDefaults synchronize];
folder = [[self clientObject] mailAccountsFolder: @"Mail" folder = [[self clientObject] mailAccountsFolder: @"Mail"
inContext: context]; inContext: context];
account = [folder lookupName: @"0" inContext: context acquire: NO]; account = [folder lookupName: @"0" inContext: context acquire: NO];
[account updateFilters];
<<<<<<< HEAD
if (hasChanged)
method = @"window.location.reload()";
else
method = nil;
results = [self jsCloseWithRefreshMethod: method];
}
else
results = self;
=======
if([account updateFilters]){ if([account updateFilters]){
results = [self responseWithStatus: 200 andJSONRepresentation: [NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithBool:hasChanged], @"hasChanged", nil]]; results = [self responseWithStatus: 200 andJSONRepresentation: [NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithBool:hasChanged], @"hasChanged", nil]];
} }
@ -1295,7 +1261,6 @@ static NSArray *reminderValues = nil;
results = self; results = self;
} }
>>>>>>> a005b93... bug 1046 finished, if sieve server is not responding an error message will appear
return results; return results;
} }

9
UI/WebServerResources/UIxPreferences.js
View file

@ -80,13 +80,6 @@ function savePreferences(sender) {
} }
if (sendForm) { if (sendForm) {
<<<<<<< HEAD
saveMailAccounts();
$("mainForm").submit();
}
return false;
=======
saveMailAccounts(); saveMailAccounts();
triggerAjaxRequest($("mainForm").readAttribute("action"), function (http) { triggerAjaxRequest($("mainForm").readAttribute("action"), function (http) {
@ -111,8 +104,6 @@ function savePreferences(sender) {
{ "Content-type": "application/x-www-form-urlencoded" }); { "Content-type": "application/x-www-form-urlencoded" });
} }
return false; return false;
>>>>>>> a005b93... bug 1046 finished, if sieve server is not responding an error message will appear
} }
function prototypeIfyFilters() { function prototypeIfyFilters() {