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

Improve sort validation in Contacts module

pull/228/head
Francis Lachapelle 2016-11-28 10:33:38 -05:00
parent c3376a4ddf
commit 328d67ec3a
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
UI/Contacts/UIxContactsListActions.m
View File

@ -79,10 +79,18 @@
{
NSString *s;
WORequest *rq;
static NSArray *sortKeys = nil;
if (!sortKeys)
{
sortKeys = [NSArray arrayWithObjects: @"c_cn", @"c_sn", @"c_givenname", @"c_mail",
@"c_screenname", @"c_o", @"c_telephonenumber", nil];
[sortKeys retain];
}
rq = [context request];
s = [rq formValueForKey: @"sort"];
if (![s length])
if (![s length] || ![sortKeys containsObject: s])
s = [self defaultSortKey];
return s;
@ -98,7 +106,8 @@
ascending = [[context request] formValueForKey: @"asc"];
if ([sort length])
{
{
sort = [self sortKey];
us = [[context activeUser] userSettings];
contactSettings = [us objectForKey: @"Contact"];
// Must create if it doesn't exist