From 829961225d6a85ac66c64a848fff14c0fd17befa Mon Sep 17 00:00:00 2001
From: Jonathan Yarbor <jon@nodecraft.com>
Date: Wed, 14 Dec 2016 14:27:42 -0600
Subject: [PATCH] Patch new `selectFields` method

Whoop! Sorry about the previous issue. This server is difficult to test
changes to without knowing which version of Slim is being used. :)
---
 internal/Utils.php | 31 +++++++++++--------------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/internal/Utils.php b/internal/Utils.php
index d556d04..180d0b1 100644
--- a/internal/Utils.php
+++ b/internal/Utils.php
@@ -34,29 +34,20 @@ function paginate($app, $cursor)
 
 function selectFields($allowed, $request, $default = null)
 {
-    $paramFields = $request->params("fields");
-    if (!isset($paramFields)) {
-        if (!is_null($default)) {
-            return $default;
-        } else {
+    // enforce default or default down to allowed
+    if (is_null($request->params("fields"))) {
+        if (is_null($default)) {
             return $allowed;
         }
-    } else {
-        $paramFields = preg_split("/\\,/i", $paramFields);
-    }
-    $fields = $allowed;
-    foreach ($allowed as $field) {
-        if ("_id" === $field) {
-            continue;
-        } else {
-            if (!in_array($field, $paramFields)) {
-                if (($key = array_search($field, $fields)) !== false) {
-                    unset($fields[$key]);
-                }
-            }
-        }
+        return $default;
     }
-    return $fields;
+    // split by comma, remove all whitespace, cast to lower case
+    $fields = array_map(function($input){
+        return trim(strtolower($input));
+    }, explode(',', $request->params("fields")));
+
+    // return all keys which intersect with the allowed list
+    return array_intersect($allowed, $fields);
 }