Fix previous commit conditions about active status of users in advanced search

Fix issues with official_code that can now be null in advanced users search

main/admin/user_list.php

@@ -199,6 +199,7 @@ function prepare_user_sql_query($is_count)
         'keyword_officialcode',
         'keyword_status',
         'keyword_active',
+        'keyword_inactive',
         'check_easy_passwords'
     );
 
@@ -260,25 +261,27 @@ function prepare_user_sql_query($is_count)
         */
 
         $sql .= " $query_admin_table
-                WHERE (
-                    u.firstname LIKE '". Database::escape_string("%".$keywordListValues['keyword_firstname']."%")."' AND
-                    u.lastname LIKE '". Database::escape_string("%".$keywordListValues['keyword_lastname']."%")."' AND
-                    u.username LIKE '". Database::escape_string("%".$keywordListValues['keyword_username']."%")."' AND
-                    u.email LIKE '". Database::escape_string("%".$keywordListValues['keyword_email']."%")."' AND
-                    u.official_code LIKE '". Database::escape_string("%".$keywordListValues['keyword_officialcode']."%")."' AND
-                    u.status LIKE '".Database::escape_string($keywordListValues['keyword_status'])."'
-                    $keyword_admin
-                    $keyword_extra_value
-                ";
-
-        if (isset($keywordListValues['keyword_active'])) {
-            if (!empty($keywordListValues['keyword_active'])) {
-                $sql .= " AND u.active = 1";
-            } else {
-                $sql .= " AND u.active = 0";
-            }
+            WHERE (
+                u.firstname LIKE '". Database::escape_string("%".$keywordListValues['keyword_firstname']."%")."' AND
+                u.lastname LIKE '". Database::escape_string("%".$keywordListValues['keyword_lastname']."%")."' AND
+                u.username LIKE '". Database::escape_string("%".$keywordListValues['keyword_username']."%")."' AND
+                u.email LIKE '". Database::escape_string("%".$keywordListValues['keyword_email']."%")."' AND
+                u.status LIKE '".Database::escape_string($keywordListValues['keyword_status'])."'  
+         ";
+        if (!empty($keywordListValues['keyword_officialcode'])) {
+            $sql .= " AND u.official_code LIKE '" . Database::escape_string("%" . $keywordListValues['keyword_officialcode'] . "%") . "' ";
+        }
+        $sql .= "
+            $keyword_admin
+            $keyword_extra_value
+        ";
+
+        if (isset($keywordListValues['keyword_active']) && !isset($keywordListValues['keyword_inactive'])) {
+            $sql .= " AND u.active = 1";
+        } elseif (isset($keywordListValues['keyword_inactive']) && !isset($keywordListValues['keyword_active'])) {
+            $sql .= " AND u.active = 0";
         }
-        $sql .= ')';
+        $sql .= " ) ";
     }
 
     // adding the filter to see the user's only of the current access_url