diff --git a/admin_user.php b/admin_user.php
index 6f9899d7..4c5980bc 100644
--- a/admin_user.php
+++ b/admin_user.php
@@ -6,17 +6,24 @@ $order = "ASC";
require_once "includes/inc_all_admin.php";
-
-//Rebuild URL
-$url_query_strings_sort = http_build_query($get_copy);
+// User Type Filter
+if (isset($_GET['type']) && $_GET['type'] == "client") {
+ $type_filter = "client";
+ $type_query = "AND user_type = 2";
+} else {
+ $type_filter = "user";
+ $type_query = "AND user_type = 1";
+}
$sql = mysqli_query(
$mysqli,
- "SELECT SQL_CALC_FOUND_ROWS * FROM users, user_settings, user_roles
- WHERE users.user_id = user_settings.user_id
- AND user_role_id = role_id
- AND (user_name LIKE '%$q%' OR user_email LIKE '%$q%')
+ "SELECT SQL_CALC_FOUND_ROWS * FROM users
+ LEFT JOIN user_roles ON user_role_id = role_id
+ LEFT JOIN user_settings ON users.user_id = user_settings.user_id
+ LEFT JOIN contacts ON users.user_id = contact_user_id
+ WHERE (user_name LIKE '%$q%' OR user_email LIKE '%$q%')
AND user_archived_at IS NULL
+ $type_query
ORDER BY $sort $order LIMIT $record_from, $record_to"
);
@@ -36,6 +43,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));