From 328d67ec3a8d46e975f7826902fde004195b2c20 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Mon, 28 Nov 2016 10:33:38 -0500
Subject: [PATCH] Improve sort validation in Contacts module

---
 UI/Contacts/UIxContactsListActions.m | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/UI/Contacts/UIxContactsListActions.m b/UI/Contacts/UIxContactsListActions.m
index 8266e7ab8..6358eb3bd 100644
--- a/UI/Contacts/UIxContactsListActions.m
+++ b/UI/Contacts/UIxContactsListActions.m
@@ -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