← All changes | app/Http/Controllers/AdminController.php +32 -43 1.5.01 → 2.5.0 View file →

		@@ -2,10 +2,8 @@
2	2
3	3	namespace FluentBooking\App\Http\Controllers;
4	4
5	5	use FluentBooking\App\Models\Calendar;
6		-use FluentBooking\App\Models\Meta;
7		-use FluentBooking\App\Services\PermissionManager;
8	6	use FluentBooking\Framework\Http\Request\Request;
9	7	use FluentBooking\App\Services\Helper;
10	8
11	9	class AdminController extends Controller
		@@ -26,40 +24,47 @@
26	24	}
27	25
28	26	$search_term = sanitize_text_field($request->get('search'));
29	27
30		- $queryArgs = [
	28	+ // The total is never used, and counting it forces a full scan of every matching user
	29	+ $baseArgs = [
31	30	'role__not_in' => ['subscriber'],
32	31	'number' => 50,
33	32	'fields' => ['ID', 'user_email', 'display_name'],
34		- 'search' => '*' . $search_term . '*'
	33	+ 'count_total' => false
35	34	];
36	35
37		- $metaQueryArgs = [
38		- 'role__not_in' => ['subscriber'],
39		- 'number' => 50,
40		- 'fields' => ['ID', 'user_email', 'display_name'],
41		- 'meta_query' => [
42		- 'relation' => 'OR',
43		- [
44		- 'key' => 'first_name',
45		- 'value' => $search_term,
46		- 'compare' => 'LIKE'
	36	+ if ($search_term === '') {
	37	+ $users = get_users(apply_filters('fluent_booking/user_search_meta_query_arguments', $baseArgs, $search_term));
	38	+ } else {
	39	+ $queryArgs = array_merge($baseArgs, [
	40	+ 'search' => '*' . $search_term . '*'
	41	+ ]);
	42	+
	43	+ $metaQueryArgs = array_merge($baseArgs, [
	44	+ /* phpcs:disable WordPress.DB.SlowDBQuery.slow_db_query_meta_query */
	45	+ 'meta_query' => [
	46	+ 'relation' => 'OR',
	47	+ [
	48	+ 'key' => 'first_name',
	49	+ 'value' => $search_term,
	50	+ 'compare' => 'LIKE'
	51	+ ],
	52	+ [
	53	+ 'key' => 'last_name',
	54	+ 'value' => $search_term,
	55	+ 'compare' => 'LIKE'
	56	+ ]
47	57	],
48		- [
49		- 'key' => 'last_name',
50		- 'value' => $search_term,
51		- 'compare' => 'LIKE'
52		- ]
53		- ],
54		- ];
	58	+ ]);
55	59
56		- $metaQueryArgs = apply_filters('fluent_booking/user_search_meta_query_arguments', $metaQueryArgs, $search_term);
	60	+ $metaQueryArgs = apply_filters('fluent_booking/user_search_meta_query_arguments', $metaQueryArgs, $search_term);
57	61
58		- $queryResult = get_users($queryArgs);
59		- $metaQueryResult = get_users($metaQueryArgs);
	62	+ $queryResult = get_users($queryArgs);
	63	+ $metaQueryResult = get_users($metaQueryArgs);
60	64
61		- $users = array_unique(array_merge($queryResult, $metaQueryResult), SORT_REGULAR);
	65	+ $users = array_unique(array_merge($queryResult, $metaQueryResult), SORT_REGULAR);
	66	+ }
62	67
63	68	$hosts = [];
64	69	$pushedIds = [];
65	70	$calendarUserIds = Calendar::where('type', 'simple')->pluck('user_id')->toArray();
		@@ -131,27 +136,11 @@
131	136	}
132	137
133	138	public function getAllHosts(Request $request)
134	139	{
135		- $calendars = Calendar::with(['user'])
136		- ->where('type', 'simple')
137		- ->get();
	140	+ $allHosts = Calendar::getAllHosts();
138	141
139		- $deletedUser = __('Deleted User', 'fluent-booking');
140		-
141		- $hosts = $calendars->map(function ($calendar) use ($deletedUser) {
142		- $user = $calendar->user;
143		- return [
144		- 'id' => $user ? $user->ID : (int)$calendar->user_id,
145		- 'name' => $user ? $user->full_name : $deletedUser,
146		- 'label' => $user ? $user->display_name . ' (' . $user->user_email . ')' : $deletedUser,
147		- 'avatar' => $calendar->getAuthorPhoto(),
148		- 'calendar_id' => $calendar->id,
149		- 'deleted_user' => $user ? false : true
150		- ];
151		- });
152		-
153	142	return [
154		- 'hosts' => $hosts
	143	+ 'hosts' => $allHosts
155	144	];
156	145	}
157	146	}