allow using OR operator in ListUsers endpoint (NamelessMC#2460)

RageOfFire · Oct 24, 2021 · 3175009 · 3175009
1 parent cce8d26
commit 3175009
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/modules/Core/includes/endpoints/ListUsersEndpoint.php b/modules/Core/includes/endpoints/ListUsersEndpoint.php
@@ -22,14 +22,18 @@ public function execute(Nameless2API $api) {
             $query = 'SELECT u.id, u.username, u.uuid, u.isbanned AS banned, u.active FROM nl2_users u';
         }
 
+        $operator = isset($_GET['operator']) && $_GET['operator'] == 'OR'
+                        ? ' OR'
+                        : ' AND';
+
         if (isset($_GET['group_id'])) {
             $query .= ' INNER JOIN nl2_users_groups ug ON u.id = ug.user_id WHERE ug.group_id = ' . $_GET['group_id'];
             $filterGroup = true;
         }
 
         if (isset($_GET['banned'])) {
             if (isset($filterGroup)) {
-                $query .= ' AND';
+                $query .= $operator;
             } else {
                 $query .= ' WHERE';
             }
@@ -39,7 +43,7 @@ public function execute(Nameless2API $api) {
 
         if (isset($_GET['active'])) {
             if (isset($filterBanned) || isset($filterGroup)) {
-                $query .= ' AND';
+                $query .= $operator;
             } else {
                 $query .= ' WHERE';
             }
@@ -49,7 +53,7 @@ public function execute(Nameless2API $api) {
 
         if ($discord_enabled && isset($_GET['discord_linked'])) {
             if (isset($filterBanned) || isset($filterActive) || isset($filterGroup)) {
-                $query .= ' AND';
+                $query .= $operator;
             } else {
                 $query .= ' WHERE';
             }