From 582102c2c6e7bc1498700e17daff27e2e111c056 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 11 May 2020 09:19:16 -0400
Subject: [PATCH] Fix use of backticks for newer mysql

---
 web/ajax/status.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/web/ajax/status.php b/web/ajax/status.php
index f90f24911..3821ac9ce 100644
--- a/web/ajax/status.php
+++ b/web/ajax/status.php
@@ -246,7 +246,7 @@ function collectData() {
         if ( isset($elementData['sql']) )
           $fieldSql[] = $elementData['sql'].' as '.$element;
         else
-          $fieldSql[] = '`'.$element.'`';
+          $fieldSql[] = $element;
         if ( isset($elementData['table']) && isset($elementData['join']) ) {
           $joinSql[] = 'left join '.$elementData['table'].' on '.$elementData['join'];
         }
@@ -257,15 +257,15 @@ function collectData() {
     } # end foreach element
 
     if ( count($fieldSql) ) {
-      $sql = 'SELECT '.join(', ', $fieldSql).' FROM '.$entitySpec['table'];
+      $sql = 'SELECT '.join(', ', array_map($fieldSql, function($f){return '`'.$f.''''})).' FROM '.$entitySpec['table'];
       if ( $joinSql )
         $sql .= ' '.join(' ', array_unique($joinSql));
       if ( $id && !empty($entitySpec['selector']) ) {
         $index = 0;
         $where = array();
-        foreach( $entitySpec['selector'] as $selIndex => $selector ) {
+        foreach ( $entitySpec['selector'] as $selIndex => $selector ) {
           $selectorParamName = ':selector' . $selIndex;
-          if ( is_array( $selector ) ) {
+          if ( is_array($selector) ) {
             $where[] = $selector['selector'].' = '.$selectorParamName;
             $values[$selectorParamName] = validInt($id[$index]);
           } else {
@@ -280,7 +280,7 @@ function collectData() {
         $sql .= ' GROUP BY '.join(',', array_unique($groupSql));
       if ( !empty($_REQUEST['sort']) ) {
         $sql .= ' ORDER BY ';
-        $sort_fields = explode(',',$_REQUEST['sort']);
+        $sort_fields = explode(',', $_REQUEST['sort']);
         foreach ( $sort_fields as $sort_field ) {
           
           preg_match('/^`?(\w+)`?\s*(ASC|DESC)?( NULLS FIRST)?$/i', $sort_field, $matches);
@@ -288,7 +288,7 @@ function collectData() {
             if ( in_array($matches[1], $fieldSql) ) {
               $sql .= $matches[1];
             } else {
-              ZM\Error('Sort field ' . $matches[1] . ' not in SQL Fields');
+              ZM\Error('Sort field '.$matches[1].' from ' .$sort_field.' not in SQL Fields: '.join(',', $sort_field);
             }
             if ( count($matches) > 2 ) {
               $sql .= ' '.strtoupper($matches[2]);