← All changes | core/wpbc-activation.php +97 -13 11.7 → 11.9 View file →

		@@ -13,8 +13,59 @@
13	13
14	14	if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
15	15
16	16
	17	+/**
	18	+ * Evaluate whether the current activation starts from a genuinely empty install.
	19	+ *
	20	+ * Both signals are required. A missing version option by itself is not reliable,
	21	+ * because older installations or interrupted upgrades can still have Booking
	22	+ * Calendar tables. A missing table by itself is also insufficient when stored
	23	+ * installation metadata remains.
	24	+ *
	25	+ * @param mixed $stored_version Stored Booking Calendar version, or false when absent.
	26	+ * @param bool $booking_table_exists Whether the canonical booking table exists.
	27	+ *
	28	+ * @return bool True only when neither installation signal exists.
	29	+ */
	30	+function wpbc_is_plugin_initial_install_state( $stored_version, $booking_table_exists ) {
	31	+
	32	+ return ( false === $stored_version ) && ! (bool) $booking_table_exists;
	33	+}
	34	+
	35	+
	36	+/**
	37	+ * Check whether the active activation request is a genuine first installation.
	38	+ *
	39	+ * The result is cached before activation creates tables or saves
	40	+ * `booking_version_num`, allowing later activation callbacks to consume the same
	41	+ * immutable request-scoped decision. For later administration requests, use the
	42	+ * persisted first-install marker owned by the Setup Wizard instead.
	43	+ *
	44	+ * @return bool True during a genuine first-install activation; otherwise false.
	45	+ */
	46	+function wpbc_is_plugin_initial_install() {
	47	+
	48	+ static $is_initial_install = null;
	49	+
	50	+ if ( null !== $is_initial_install ) {
	51	+ return $is_initial_install;
	52	+ }
	53	+
	54	+ if ( ! function_exists( 'wpbc_is_table_exists' ) ) {
	55	+ $is_initial_install = false;
	56	+ return $is_initial_install;
	57	+ }
	58	+
	59	+ $is_initial_install = wpbc_is_plugin_initial_install_state(
	60	+ get_option( 'booking_version_num', false ),
	61	+ wpbc_is_table_exists( 'booking' )
	62	+ );
	63	+
	64	+ return $is_initial_install;
	65	+}
	66	+
	67	+
17	68	/** Activation & Deactivation of Booking Calendar */
18	69	class WPBC_BookingInstall extends WPBC_Install {
19	70
20	71	/**
		@@ -190,12 +241,9 @@
190	241	function wpbc_booking_activate() {
191	242
192	243	wpbc_load_translation();
193	244
194		- $is_new_install = (
195		- false === get_option( 'booking_version_num', false )
196		- && ! wpbc_is_table_exists( 'booking' )
197		- );
	245	+ $is_new_install = wpbc_is_plugin_initial_install();
198	246
199	247	make_bk_action( 'wpbc_before_activation' );
200	248
201	249
		@@ -205,12 +253,18 @@
205	253
206	254	// -----------------------------------------------------------------------------------------------------------------
207	255	// Options
208	256	// -----------------------------------------------------------------------------------------------------------------
209		- $default_options_to_add = wpbc_get_default_options();
	257	+ $default_options_to_add = wpbc_get_default_options();
210	258	// Existing installations retain their saved value; add_bk_option() never overwrites it during upgrades.
211	259	if ( $is_new_install ) {
212	260	$default_options_to_add['booking_form_accent_enabled'] = 'On';
	261	+ $default_options_to_add['booking_setup_wizard_initial_install'] = 'On';
	262	+ $default_options_to_add['booking_setup_wizard_first_run_prompt'] = 'On';
	263	+ $default_options_to_add['booking_setup_wizard_booking_pages_prompt'] = 'On';
	264	+ if ( ! class_exists( 'wpdev_bk_personal' ) ) {
	265	+ $default_options_to_add['booking_resources_catalog_default_view'] = 'publishing';
	266	+ }
213	267	}
214	268	// TODO: for Import / Export options, we can use this function to get all option_names and then just get the real values from the wp_options table.
215	269	make_bk_action( 'wpbc_before_activation__add_options', $default_options_to_add ); // FixIn: 9.6.2.11.
216	270
		@@ -333,9 +387,13 @@
333	387	$sql_check_table = "SELECT booking_id as id FROM {$wpdb->prefix}booking ORDER BY booking_id DESC LIMIT 0, 100";
334	388
335	389	$res = $wpdb->get_results( $sql_check_table ); // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching, WordPress.DB.PreparedSQL.NotPrepared, PluginCheck.Security.DirectDB.UnescapedDBParameter
336	390	foreach ( $res as $l ) {
337		- $wp_queries[] = "UPDATE {$wpdb->prefix}booking SET hash = MD5('" . time() . '_' . wp_rand( 1000, 1000000 ) . "') WHERE booking_id = " . $l->id; // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching, WordPress.DB.PreparedSQL.NotPrepared, PluginCheck.Security.DirectDB.UnescapedDBParameter
	391	+ $wp_queries[] = $wpdb->prepare(
	392	+ "UPDATE {$wpdb->prefix}booking SET hash = %s WHERE booking_id = %d",
	393	+ wpbc_hash__generate_booking_hash(),
	394	+ $l->id
	395	+ ); // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
338	396	}
339	397	}
340	398	}
341	399
		@@ -389,9 +447,9 @@
389	447	if ( $is_insert_test_bookings ) {
390	448	// -- Test Booking #1 --
391	449	$is_appr = 1;
392	450	$wp_queries_sub = "INSERT INTO {$wpdb->prefix}booking ( form, modification_date ) VALUES (
393		- 'text^name1^John~text^secondname1^Smith~text^email1^[email protected]~text^phone1^458-77-77~textarea^details1^This is a test booking showing booking for several days.', " . wpbc_sql_date_math_expr_explicit('', 'now') . " );";
	451	+ 'text^firstname1^John~text^secondname1^Smith~text^email1^[email protected]~text^phone1^458-77-77~textarea^details1^This is a test booking showing booking for several days.', " . wpbc_sql_date_math_expr_explicit('', 'now') . " );";
394	452	$wpdb->query( $wp_queries_sub ); // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching, WordPress.DB.PreparedSQL.NotPrepared, PluginCheck.Security.DirectDB.UnescapedDBParameter
395	453
396	454	$temp_id = $wpdb->insert_id;
397	455	$wp_queries_sub = "INSERT INTO {$wpdb->prefix}bookingdates ( booking_id, booking_date, approved ) VALUES
		@@ -402,9 +460,9 @@
402	460
403	461	// -- Test Booking #2 --
404	462	$is_appr = 0;
405	463	$wp_queries_sub = "INSERT INTO {$wpdb->prefix}booking ( form, modification_date ) VALUES (
406		- 'text^name1^Emma~text^secondname1^Robinson~text^email1^[email protected]~text^phone1^999-77-77~textarea^details1^This is a test booking showing booking for several days.', " . wpbc_sql_date_math_expr_explicit('', 'now') . " );";
	464	+ 'text^firstname1^Emma~text^secondname1^Robinson~text^email1^[email protected]~text^phone1^999-77-77~textarea^details1^This is a test booking showing booking for several days.', " . wpbc_sql_date_math_expr_explicit('', 'now') . " );";
407	465	$wpdb->query( $wp_queries_sub ); // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching, WordPress.DB.PreparedSQL.NotPrepared, PluginCheck.Security.DirectDB.UnescapedDBParameter
408	466
409	467	$temp_id = $wpdb->insert_id;
410	468	$wp_queries_sub = "INSERT INTO {$wpdb->prefix}bookingdates ( booking_id, booking_date, approved ) VALUES
		@@ -418,9 +476,9 @@
418	476	$is_appr = 1;
419	477	$start_time = '10:00';
420	478	$end_time = '10:30';
421	479	$wp_queries_sub = "INSERT INTO {$wpdb->prefix}booking ( form, modification_date, is_new ) VALUES (
422		- 'selectbox^rangetime1^".$start_time." - ".$end_time."~text^name1^Sophia~text^secondname1^Robinson~text^email1^[email protected]~text^phone1^458-77-77~textarea^details1^This is a test booking showing a one day time slot booking.', " . wpbc_sql_date_math_expr_explicit('', 'now') . ", 0 );";
	480	+ 'selectbox^rangetime1^".$start_time." - ".$end_time."~text^firstname1^Sophia~text^secondname1^Robinson~text^email1^[email protected]~text^phone1^458-77-77~textarea^details1^This is a test booking showing a one day time slot booking.', " . wpbc_sql_date_math_expr_explicit('', 'now') . ", 0 );";
423	481	$wpdb->query( $wp_queries_sub ); // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching, WordPress.DB.PreparedSQL.NotPrepared, PluginCheck.Security.DirectDB.UnescapedDBParameter
424	482
425	483	$temp_id = $wpdb->insert_id;
426	484
		@@ -621,11 +679,16 @@
621	679
622	680	// If this option here, then system get this option from "Super Admin" options configuration for "Regular" users.
623	681	$mu_option4delete = array();
624	682
625		- // FixIn: 9.6.3.5.
626		- $default_options['booking_setup_wizard_page_steps_is_done'] = '';
627		- $mu_option4delete[]='booking_setup_wizard_page_steps_is_done';
	683	+ $default_options['booking_setup_wizard_initial_install'] = 'Off';
	684	+ $mu_option4delete[] = 'booking_setup_wizard_initial_install';
	685	+ $default_options['booking_setup_wizard_first_run_prompt'] = 'Off';
	686	+ $mu_option4delete[] = 'booking_setup_wizard_first_run_prompt';
	687	+ $default_options['booking_setup_wizard_booking_pages_prompt'] = 'Off';
	688	+ $mu_option4delete[] = 'booking_setup_wizard_booking_pages_prompt';
	689	+ $default_options['booking_update_navigation_context'] = array();
	690	+ $mu_option4delete[] = 'booking_update_navigation_context';
628	691
629	692	$default_options['booking_admin_cal_count'] = ($is_demo) ? '3' : '2';
630	693	$mu_option4delete[]='booking_admin_cal_count'; // $multiuser_general_option[] = implode( '', array_keys( array_slice( $default_options, -1 ) ) );
631	694	$default_options['booking_skin'] = '/css/skins/25_5__square_1.css'; // FixIn: 10.11.4.2.
		@@ -634,8 +697,10 @@
634	697	$default_options['booking_listing_default_view_mode'] = 'vm_booking_listing'; // 'vm_calendar'; // FixIn: 9.6.3.5.
635	698	$mu_option4delete[]='booking_listing_default_view_mode';
636	699	$default_options['booking_admin_edit_booking_mode'] = 'popup';
637	700	$mu_option4delete[]='booking_admin_edit_booking_mode';
	701	+ $default_options['booking_resources_catalog_default_view'] = '';
	702	+ $mu_option4delete[] = 'booking_resources_catalog_default_view';
638	703
639	704	$default_options['booking_view_days_num'] = ( ( ! class_exists( 'wpdev_bk_personal' ) ) ? '90' : '30' );
640	705	$mu_option4delete[]='booking_view_days_num';
641	706	// FixIn: 8.9.4.3.
		@@ -665,9 +730,10 @@
665	730
666	731	// FixIn: 10.13.1.5.
667	732	$default_options['booking_is_use_phone_validation'] = 'Off';
668	733	$mu_option4delete[]='booking_is_use_phone_validation';
669		- $default_options['booking_date_format'] = get_option( 'date_format' );
	734	+ $wordpress_date_format = get_option( 'date_format' );
	735	+ $default_options['booking_date_format'] = ( 'F j, Y' === $wordpress_date_format ) ? 'j M Y' : $wordpress_date_format;
670	736	$mu_option4delete[]='booking_date_format';
671	737	$default_options['booking_time_format'] = get_option( 'time_format' ); //'H:i';
672	738	$mu_option4delete[]='booking_time_format';
673	739
		@@ -1322,8 +1388,26 @@
1322	1388	// FixIn: 9.2.3.8.
1323	1389	$default_options['booking_super_admin_receive_regular_user_payments'] = 'Off';
1324	1390	$mu_option4delete[]='booking_super_admin_receive_regular_user_payments';
1325	1391	}
	1392	+
	1393	+ /**
	1394	+ * Filters the complete Booking Calendar default-option registry.
	1395	+ *
	1396	+ * Edition modules may register missing-value defaults without placing their
	1397	+ * domain-specific option names in the shared Free-version implementation.
	1398	+ * Existing stored values continue to be preserved by the activation layer.
	1399	+ *
	1400	+ * @param array $default_options Default option names and values.
	1401	+ */
	1402	+ $default_options = apply_filters( 'wpbc_default_options', $default_options );
	1403	+
	1404	+ /**
	1405	+ * Filters option names handled by the applicable MultiUser cleanup flow.
	1406	+ *
	1407	+ * @param array $mu_option4delete Option names registered for cleanup.
	1408	+ */
	1409	+ $mu_option4delete = apply_filters( 'wpbc_multiuser_options_for_delete', $mu_option4delete );
1326	1410
1327	1411
1328	1412	if ( ! $is_get_multiuser_general_options ) {
1329	1413