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

Fix crash when opening a mailbox with empty filter 

Fixes #2959
pull/64/head
Francis Lachapelle 2014-10-17 15:20:25 -04:00
parent 42ef0bfc3f
commit 6695aa083f
2 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
UI/MailerUI/UIxMailListActions.m
View File

@ -394,39 +394,42 @@
NSArray *filters;
NSString *searchBy, *searchArgument, *searchInput, *searchString, *match;
NSMutableArray *searchArray;
int nbFilters = 0, i;
int nbFilters, i;
request = [context request];
content = [[request contentAsString] objectFromJSONString];
qualifier = nil;
searchString = nil;
match = nil;
filters = [content objectForKey: @"filters"];
if ([content objectForKey:@"filters"])
if (filters)
{
filters = [content objectForKey:@"filters"];
sortingAttributes = [content objectForKey:@"sortingAttributes"];
nbFilters = [filters count];
match = [NSString stringWithString:[sortingAttributes objectForKey:@"match"]]; // AND, OR
searchArray = [NSMutableArray arrayWithCapacity:nbFilters];
for (i = 0; i < nbFilters; i++)
{
searchBy = [NSString stringWithString:[[filters objectAtIndex:i] objectForKey:@"searchBy"]];
searchArgument = [NSString stringWithString:[[filters objectAtIndex:i] objectForKey:@"searchArgument"]];
searchInput = [NSString stringWithString:[[filters objectAtIndex:i] objectForKey:@"searchInput"]];
if (nbFilters > 0) {
searchArray = [NSMutableArray arrayWithCapacity: nbFilters];
sortingAttributes = [content objectForKey: @"sortingAttributes"];
if (sortingAttributes)
match = [sortingAttributes objectForKey :@"match"]; // AND, OR
for (i = 0; i < nbFilters; i++)
{
searchBy = [NSString stringWithString: [[filters objectAtIndex:i] objectForKey: @"searchBy"]];
searchArgument = [NSString stringWithString: [[filters objectAtIndex:i] objectForKey: @"searchArgument"]];
searchInput = [NSString stringWithString: [[filters objectAtIndex:i] objectForKey: @"searchInput"]];
if ([[[filters objectAtIndex:i] objectForKey:@"negative"] boolValue])
searchString = [NSString stringWithFormat:@"(not (%@ %@: '%@'))", searchBy, searchArgument, searchInput];
if ([[[filters objectAtIndex:i] objectForKey: @"negative"] boolValue])
searchString = [NSString stringWithFormat: @"(not (%@ %@: '%@'))", searchBy, searchArgument, searchInput];
else
searchString = [NSString stringWithFormat: @"(%@ %@: '%@')", searchBy, searchArgument, searchInput];
searchQualifier = [EOQualifier qualifierWithQualifierFormat: searchString];
[searchArray addObject: searchQualifier];
}
if ([match isEqualToString: @"OR"])
qualifier = [[EOOrQualifier alloc] initWithQualifierArray: searchArray];
else
searchString = [NSString stringWithFormat:@"(%@ %@: '%@')", searchBy, searchArgument, searchInput];
searchQualifier = [EOQualifier qualifierWithQualifierFormat:searchString];
[searchArray addObject:searchQualifier];
}
if ([match isEqualToString:@"OR"])
qualifier = [[EOOrQualifier alloc] initWithQualifierArray: searchArray];
else
qualifier = [[EOAndQualifier alloc] initWithQualifierArray: searchArray];
qualifier = [[EOAndQualifier alloc] initWithQualifierArray: searchArray];
}
}
return qualifier;

2
UI/WebServerResources/MailerUI.js
View File

@ -843,7 +843,7 @@ function composeNewMessage() {
function openMailbox(mailbox, reload) {
if (mailbox != Mailer.currentMailbox || reload) {
var url = ApplicationBaseURL + encodeURI(mailbox.unescapeHTML());
var urlParams = {"filters": [], "sortingAttributes": {}};
var urlParams = {filters: [], sortingAttributes: {}};
if (!reload) {
var messageContent = $("messageContent");