From f261ce034b92b91e9adca478d1bca29666312a4f Mon Sep 17 00:00:00 2001
From: "Ziwen@miniserver" <ziwen.su@tu-dresden.de>
Date: Fri, 31 Jul 2020 23:15:03 +0200
Subject: [PATCH] Matched the backend of Jobtag.

---
 backend/php/FilterClause.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/backend/php/FilterClause.php b/backend/php/FilterClause.php
index e07baa4..bf3c6d8 100644
--- a/backend/php/FilterClause.php
+++ b/backend/php/FilterClause.php
@@ -76,10 +76,15 @@
           $sql .= "AND ".$filterArray[$key][0]." ";
           $attributes[$filterArray[$key][6][1]] = $items[1];
         } elseif ( $items[0] == "or" ) {
-          for ( $i=1; $i<$n; $i++ ){
-            $sql .= "AND ".$filterArray[$key][$i]." ";
-            $attributes[$filterArray[$key][6][$i]] = $items[$i];
+          $sql .= "AND (".$filterArray[$key][1]." ";
+          if ( $n>2 ){
+            for ( $i=2; $i<$n; $i++ ){
+              $sql .= "OR ".$filterArray[$key][$i]." ";
+              $attributes[$filterArray[$key][6][$i]] = $items[$i];
+            }
           }
+          $sql .=") ";
+          $attributes[$filterArray[$key][6][1]] = $items[1];
         }
       } elseif ( strpos($key, '_INT') !== false ) {
         $items = explode(" ", $value);
-- 
GitLab