From 107c9343717a90b45a681261db972299ce25a7ec Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Tue, 22 Jun 2021 19:31:04 +0200
Subject: [PATCH] Fixed not conditional in where_clause builder (mysql)

---
 pandora_console/include/db/mysql.php | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/pandora_console/include/db/mysql.php b/pandora_console/include/db/mysql.php
index 8b7c81c9f9..3f0ddf967c 100644
--- a/pandora_console/include/db/mysql.php
+++ b/pandora_console/include/db/mysql.php
@@ -732,19 +732,23 @@ function mysql_db_format_array_where_clause_sql($values, $join='AND', $prefix=fa
             }
         }
 
-        if (is_null($value)) {
-            $query .= sprintf('%s IS NULL', $field);
+        if ($value === null) {
+            $not = (($negative === true) ? 'NOT' : '');
+            $query .= sprintf('%s IS %s NULL', $field, $negative);
         } else if (is_int($value) || is_bool($value)) {
-            $query .= sprintf('%s = %d', $field, $value);
+            $not = (($negative === true) ? '!' : '');
+            $query .= sprintf('%s %s= %d', $field, $not, $value);
         } else if (is_float($value) || is_double($value)) {
-            $query .= sprintf('%s = %f', $field, $value);
+            $not = (($negative === true) ? ' !' : '');
+            $query .= sprintf('%s %s= %f', $field, $not, $value);
         } else if (is_array($value)) {
-            $not = $negative ? ' NOT ' : '';
-            $query .= sprintf('%s %sIN ("%s")', $field, $not, implode('", "', $value));
+            $not = (($negative === true) ? 'NOT' : '');
+            $query .= sprintf('%s %s IN ("%s")', $field, $not, implode('", "', $value));
         } else {
             if ($value === '') {
-                // Search empty string
-                $query .= sprintf("%s = ''", $field);
+                // Search empty string.
+                $not = (($negative === true) ? '!' : '');
+                $query .= sprintf("%s %s= ''", $field, $not);
             } else if ($value[0] == '>') {
                 $value = substr($value, 1, (strlen($value) - 1));
                 $query .= sprintf("%s > '%s'", $field, $value);
@@ -757,9 +761,11 @@ function mysql_db_format_array_where_clause_sql($values, $join='AND', $prefix=fa
                     $query .= sprintf("%s < '%s'", $field, $value);
                 }
             } else if ($value[0] == '%') {
-                $query .= sprintf("%s LIKE '%s'", $field, $value);
+                $not = (($negative === true) ? ' NOT ' : '');
+                $query .= sprintf("%s %s LIKE '%s'", $field, $not, $value);
             } else {
-                $query .= sprintf("%s = '%s'", $field, $value);
+                $not = (($negative === true) ? '!' : '');
+                $query .= sprintf("%s %s= '%s'", $field, $not, $value);
             }
         }