Make gridRenderSort() more robust xibosignage/xibo#2311

dasgarner · Sep 7, 2020 · e218c4d · e218c4d
1 parent e6c1129
commit e218c4d
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/lib/Controller/Base.php b/lib/Controller/Base.php
@@ -379,21 +379,28 @@ protected function gridRenderFilter($extraFilter = [])
     /**
      * Set the sort order
      * @return array
+     * @throws \Xibo\Exception\ConfigurationException
      */
     protected function gridRenderSort()
     {
         $app = $this->getApp();
 
         $columns = $app->request()->get('columns');
-
-        if ($columns == null || !is_array($columns))
+        if ($columns === null || !is_array($columns) || count($columns) <= 0) {
             return null;
+        }
 
-        $order = array_map(function ($element) use ($columns) {
-            return ((isset($columns[$element['column']]['name']) && $columns[$element['column']]['name'] != '') ? '`' . $columns[$element['column']]['name'] . '`' : '`' . $columns[$element['column']]['data'] . '`') . (($element['dir'] == 'desc') ? ' DESC' : '');
-        }, $app->request()->get('order', array()));
+        $order = $app->request()->get('order');
+        if ($order === null || !is_array($order) || count($order) <= 0) {
+            return null;
+        }
 
-        return $order;
+        return array_map(function ($element) use ($columns) {
+            return ((isset($columns[$element['column']]['name']) && $columns[$element['column']]['name'] != '')
+                    ? '`' . $columns[$element['column']]['name'] . '`'
+                    : '`' . $columns[$element['column']]['data'] . '`')
+                . (($element['dir'] == 'desc') ? ' DESC' : '');
+        }, $order);
     }
 
     /**