← All changes | app/Services/LandingPage/LandingPageHandler.php +50 -22 1.6.0 → 2.5.0 View file →

		@@ -12,8 +12,9 @@
12	12	use FluentBooking\App\Services\BookingService;
13	13	use FluentBooking\App\Services\Helper;
14	14	use FluentBooking\Framework\Support\Arr;
15	15	use FluentBooking\Framework\Support\Collection;
	16	+use FluentBooking\App\Vite;
16	17
17	18	class LandingPageHandler
18	19	{
19	20	public function boot()
		@@ -39,15 +40,23 @@
39	40	}
40	41
41	42	$authorSlug = sanitize_text_field($urlParts[1]);
42	43
	44	+ if (isset($_GET['embedded'])) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
	45	+ $this->handleEmbeddedStyle();
	46	+ }
	47	+
43	48	$this->routeView($authorSlug, Arr::get($urlParts, 2, null));
44	49	}
45	50
46	51	public function handleUrlParamsPage()
47	52	{
48		- $route = sanitize_text_field($_GET['fluent-booking']); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
	53	+ $route = isset($_GET['fluent-booking']) ? sanitize_text_field(wp_unslash($_GET['fluent-booking'])) : ''; // phpcs:ignore WordPress.Security.NonceVerification.Recommended
49	54
	55	+ if (isset($_GET['embedded'])) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
	56	+ $this->handleEmbeddedStyle();
	57	+ }
	58	+
50	59	if ($route == 'booking') {
51	60	$this->handleAfterBookingPage();
52	61	return;
53	62	}
		@@ -90,9 +99,9 @@
90	99	->first();
91	100	if (!$slot) {
92	101	return;
93	102	}
94		- $this->renderBookingView($calendar, $slot);
	103	+ return $this->renderBookingView($calendar, $slot);
95	104	}
96	105
97	106	$this->renderHostView($calendar);
98	107	}
		@@ -103,9 +112,9 @@
103	112	$settings = LandingPageHelper::getSettings($calendar, 'public');
104	113
105	114	$activeEvents = CalendarSlot::where('calendar_id', $calendar->id)
106	115	->where('status', 'active');
107		-
	116	+
108	117	if ($settings['show_type'] != 'all') {
109	118	$activeEvents = $activeEvents->whereIn('id', $settings['enabled_slots']);
110	119	}
111	120
		@@ -145,9 +154,8 @@
145	154	$activeEvent->locations = $activeEvent->defaultLocationHtml();
146	155	do_action_ref_array('fluent_booking/landing_page_event', [&$activeEvent]);
147	156	}
148	157
149		- $assetUrl = App::getInstance('url.assets');
150	158	$data = [
151	159	'calendar' => $calendar,
152	160	'events' => $activeEvents,
153	161	'author' => $authorProfile,
		@@ -153,17 +161,18 @@
153	161	'author' => $authorProfile,
154	162	'title' => $calendar->title .' - '.get_bloginfo('name'),
155	163	'description' => $metaDescription,
156	164	'url' => home_url($wp->request),
	165	+ 'embedded' => isset($_GET['embedded']) ? true : false, // phpcs:ignore WordPress.Security.NonceVerification.Recommended
157	166	'css_files' => [
158		- App::getInstance('url.assets') . 'public/saas.css'
	167	+ Vite::styleUrl('saas_css')
159	168	],
160	169	'js_files' => [
161		- 'fluent-booking-public-js' => $assetUrl . 'public/js/app.js',
	170	+ 'fluent-booking-public-js' => Vite::scriptUrl('public_app'),
162	171	],
163	172	'js_vars' => $jsVars,
164	173	'header_js_files' => [
165		- 'fluent_booking_team_app-js' => $assetUrl. 'public/js/team_app.js'
	174	+ 'fluent_booking_team_app-js' => Vite::scriptUrl('team_app')
166	175	]
167	176	];
168	177
169	178	if ($extraJsFiles) {
		@@ -171,9 +180,9 @@
171	180	$data['js_files'] = array_merge($data['js_files'], $extraJsFiles);
172	181	}
173	182
174	183	$data = apply_filters('fluent_booking/host_view_page_vars', $data, $calendar, $activeEvents, $authorProfile);
175		-
	184	+
176	185	$app = App::getInstance();
177	186	status_header(200);
178	187	$app->view->render('landing.author_landing', $data);
179	188	exit(200);
		@@ -195,9 +204,9 @@
195	204	$calendarEvent->max_lookup_date = $calendarEvent->getMaxLookUpDate();
196	205	$calendarEvent->min_lookup_date = $calendarEvent->getMinLookUpDate();
197	206
198	207	if (!empty($_REQUEST['booking_id'])) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
199		- $bookingHash = sanitize_text_field($_REQUEST['booking_id']); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
	208	+ $bookingHash = sanitize_text_field(wp_unslash($_REQUEST['booking_id'])); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
200	209	$booking = Booking::where('hash', $bookingHash)
201	210	->where('event_id', $calendarEvent->id)
202	211	->first();
203	212	if ($booking) {
		@@ -219,24 +228,27 @@
219	228	$assetUrl = App::getInstance('url.assets');
220	229
221	230	$eventVars = (new FrontEndHandler())->getCalendarEventVars($calendar, $calendarEvent);
222	231
223		- $isRtl = Helper::fluentbooking_is_rtl();
	232	+ $publicCss = 'saas_css';
224	233
225		- $publicCss = $isRtl ? 'public/saas-rtl.css' : 'public/saas.css';
	234	+ $title = $calendarEvent->title . ' ' . __('with', 'fluent-booking') . ' ' . $authorProfile['name'];
226	235
	236	+ $title = apply_filters('fluent_booking/booking_confirmation_page_title', $title, $calendarEvent, $authorProfile);
	237	+
227	238	$data = [
228	239	'calendar' => $calendar,
229	240	'calendar_event' => $calendarEvent,
230	241	'author' => $authorProfile,
231		- 'title' => $calendarEvent->title . ' ' . __('with', 'fluent-booking') . ' ' . $authorProfile['name'],
	242	+ 'title' => $title,
232	243	'description' => substr(strip_shortcodes(wp_strip_all_tags(str_replace(PHP_EOL, ' ', $calendarEvent->description))), 0, 300) . '...',
233	244	'url' => home_url($wp->request),
	245	+ 'embedded' => isset($_GET['embedded']) ? true : false, // phpcs:ignore WordPress.Security.NonceVerification.Recommended
234	246	'css_files' => [
235		- $assetUrl . $publicCss
	247	+ Vite::styleUrl($publicCss)
236	248	],
237	249	'js_files' => [
238		- 'fluent-booking-public-js' => $assetUrl . 'public/js/app.js',
	250	+ 'fluent-booking-public-js' => Vite::scriptUrl('public_app'),
239	251	],
240	252	'js_vars' => [
241	253	'fluentCalendarPublicVars' => (new FrontEndHandler())->getGlobalVars(),
242	254	'fcal_public_vars_' . $calendar->id . '_' . $calendarEvent->id => $eventVars,
		@@ -300,12 +312,9 @@
300	312	$responseHtml = BookingService::getBookingConfirmationHtml($booking, $actionType);
301	313
302	314	$authorProfile = $calendarEvent->getAuthorProfile(true);
303	315
304		- $publicCss = 'public/saas_public.css';
305		- if (Helper::fluentbooking_is_rtl()) {
306		- $publicCss = 'public/saas_public-rtl.css';
307		- }
	316	+ $publicCss = 'saas_public_css';
308	317
309	318	$data = [
310	319	'title' => __('Confirmation: ', 'fluent-booking') . $calendarEvent->title . ' ' . __('with', 'fluent-booking') . ' ' . $authorProfile['name'],
311	320	'body' => $responseHtml,
		@@ -310,9 +319,9 @@
310	319	'title' => __('Confirmation: ', 'fluent-booking') . $calendarEvent->title . ' ' . __('with', 'fluent-booking') . ' ' . $authorProfile['name'],
311	320	'body' => $responseHtml,
312	321	'description' => substr(strip_shortcodes(wp_strip_all_tags(str_replace(PHP_EOL, ' ', $calendarEvent->description))), 0, 300) . '...',
313	322	'css_files' => [
314		- App::getInstance('url.assets') . $publicCss
	323	+ Vite::styleUrl($publicCss)
315	324	],
316	325	'js_files' => [],
317	326	'js_vars' => [],
318	327	'author' => $authorProfile,
		@@ -318,8 +327,9 @@
318	327	'author' => $authorProfile,
319	328	'slot' => $calendarEvent,
320	329	'url' => home_url($wp->request),
321	330	'action_type' => $actionType,
	331	+ 'embedded' => isset($_GET['embedded']) ? true : false, // phpcs:ignore WordPress.Security.NonceVerification.Recommended
322	332	'theme' => Arr::get(get_option('_fluent_booking_settings'), 'theme','system-default'),
323	333	'back_button' => [
324	334	'show' => true,
325	335	'text' => __('Back to home', 'fluent-booking'),
		@@ -327,9 +337,9 @@
327	337	]
328	338	];
329	339
330	340	if ($actionType == 'cancel') {
331		- $data['js_files']['fluent-booking-public-manage-meeting-js'] = App::getInstance('url.assets') . 'public/js/public-manage-meeting.js';
	341	+ $data['js_files']['fluent-booking-public-manage-meeting-js'] = Vite::scriptUrl('manage_meeting');
332	342	}
333	343
334	344	$data = apply_filters('fluent_booking/booking_confirmation_page_vars', $data, $booking, $calendarEvent);
335	345
		@@ -340,9 +350,9 @@
340	350	}
341	351
342	352	private function handleAfterBookingPage()
343	353	{
344		- $bookingHash = sanitize_text_field(Arr::get($_REQUEST, 'meeting_hash')); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
	354	+ $bookingHash = sanitize_text_field(wp_unslash(Arr::get($_REQUEST, 'meeting_hash'))); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
345	355	if (!$bookingHash) {
346	356	return;
347	357	}
348	358
		@@ -424,8 +434,26 @@
424	434
425	435	$this->renderBookingView($booking->calendar, $booking->calendar_event, $booking, true);
426	436	}
427	437
	438	+ private function handleEmbeddedStyle()
	439	+ {
	440	+ add_action('wp_print_styles', function () {
	441	+ global $wp_styles;
	442	+ if($wp_styles) {
	443	+ foreach ($wp_styles->queue as $style) {
	444	+ $src = $wp_styles->registered[$style]->src;
	445	+ if (
	446	+ (strpos($src, 'fluentbooking') === false) &&
	447	+ (strpos($src, 'fluent_booking') === false)
	448	+ ) {
	449	+ wp_dequeue_style($wp_styles->registered[$style]->handle);
	450	+ }
	451	+ }
	452	+ }
	453	+ }, 100);
	454	+ }
	455	+
428	456	public function getEventLandingExtraJsFiles($formFields, $calendarEvent)
429	457	{
430	458	$files = [];
431	459	$assetUrl = App::getInstance('url.assets');
		@@ -430,9 +458,9 @@
430	458	$files = [];
431	459	$assetUrl = App::getInstance('url.assets');
432	460
433	461	if (BookingFieldService::hasPhoneNumberField($formFields)) {
434		- $files['fluent-booking-phone-field-js'] = $assetUrl . 'public/js/phone-field.js';
	462	+ $files['fluent-booking-phone-field-js'] = Vite::scriptUrl('phone_field');
435	463	}
436	464
437	465	if ($calendarEvent->type == 'paid') {
438	466	$files['fluent-booking-checkout-sdk-stripe-js'] = 'https://js.stripe.com/v3/';