← All changes | classes/controllers/FrmHooksController.php +38 -80 6.31 → 6.7 View file →

		@@ -12,16 +12,16 @@
12	12	*
13	13	* @return void
14	14	*/
15	15	public static function trigger_load_hook( $hooks = 'load_hooks' ) {
16		- $controllers = apply_filters( 'frm_load_controllers', array( 'FrmHooksController' ) );
	16	+ $controllers = apply_filters( 'frm_load_controllers', array( 'FrmHooksController' ) );
	17	+
17	18	$trigger_hooks = $hooks;
18	19	$hooks = (array) $hooks;
19	20
20		- if ( 'load_hooks' === $trigger_hooks ) {
	21	+ if ( 'load_hooks' == $trigger_hooks ) {
21	22	if ( is_admin() ) {
22	23	$hooks[] = 'load_admin_hooks';
23		-
24	24	if ( defined( 'DOING_AJAX' ) ) {
25	25	$hooks[] = 'load_ajax_hooks';
26	26	$hooks[] = 'load_form_hooks';
27	27	}
		@@ -35,9 +35,9 @@
35	35	add_filter( 'frm' . str_replace( 'load', '', $trigger_hooks ) . '_loaded', '__return_true' );
36	36	}
37	37	unset( $trigger_hooks );
38	38
39		- // Instantiate Controllers.
	39	+ // Instansiate Controllers.
40	40	foreach ( $controllers as $c ) {
41	41	foreach ( $hooks as $hook ) {
42	42	if ( is_callable( array( $c, $hook ) ) ) {
43	43	call_user_func( array( $c, $hook ) );
		@@ -45,8 +45,9 @@
45	45	unset( $hook );
46	46	}
47	47	unset( $c );
48	48	}
	49	+
49	50	}
50	51
51	52	/**
52	53	* @return void
		@@ -58,12 +59,10 @@
58	59	/**
59	60	* @return void
60	61	*/
61	62	public static function load_hooks() {
62		- // Use 0 so this gets triggered before FrmFormActionsController::register_post_types.
63		- add_action( 'init', 'FrmAppController::load_lang', 0 );
64		-
65	63	add_action( 'rest_api_init', 'FrmAppController::create_rest_routes', 0 );
	64	+ add_action( 'plugins_loaded', 'FrmAppController::load_lang' );
66	65	add_filter( 'widget_text', 'do_shortcode' );
67	66
68	67	// Entries controller.
69	68	add_action( 'wp_loaded', 'FrmEntriesController::process_entry', 10, 0 );
		@@ -71,9 +70,8 @@
71	70
72	71	// Form Actions Controller.
73	72	add_action( 'init', 'FrmFormActionsController::register_post_types', 1 );
74	73	add_action( 'frm_after_create_entry', 'FrmFormActionsController::trigger_create_actions', 20, 3 );
75		- add_filter( 'pre_wpml_is_translated_post_type', 'FrmFormActionsController::prevent_wpml_translations', 10, 2 );
76	74
77	75	// Forms Controller.
78	76	add_action( 'widgets_init', 'FrmFormsController::register_widgets' );
79	77	add_action( 'init', 'FrmFormsController::front_head' );
		@@ -80,9 +78,8 @@
80	78	add_filter( 'frm_content', 'FrmFormsController::filter_content', 10, 3 );
81	79	add_filter( 'frm_replace_content_shortcodes', 'FrmFormsController::replace_content_shortcodes', 20, 3 );
82	80	add_action( 'admin_bar_init', 'FrmFormsController::admin_bar_css' );
83	81	add_action( 'wp_footer', 'FrmFormsController::footer_js', 1, 0 );
84		- add_action( 'wp_footer', 'FrmHoneypot::maybe_print_honeypot_js', 99 );
85	82
86	83	add_action( 'wp_scheduled_delete', 'FrmForm::scheduled_delete' );
87	84
88	85	// Form Shortcodes.
		@@ -107,8 +104,9 @@
107	104	add_filter( 'frm_keep_name_value_array', '__return_true' );
108	105
109	106	// Elementor.
110	107	add_action( 'elementor/widgets/register', 'FrmElementorController::register_elementor_hooks' );
	108	+ add_filter( 'frm_fields_in_form_builder', 'FrmFormsController::update_form_builder_fields', 10, 2 );
111	109
112	110	// Summary emails.
113	111	add_action( 'frm_daily_event', 'FrmEmailSummaryController::maybe_send_emails' );
114	112
		@@ -113,13 +111,8 @@
113	111	add_action( 'frm_daily_event', 'FrmEmailSummaryController::maybe_send_emails' );
114	112
115	113	FrmTransLiteHooksController::load_hooks();
116	114	FrmStrpLiteHooksController::load_hooks();
117		- FrmSquareLiteHooksController::load_hooks();
118		- FrmPayPalLiteHooksController::load_hooks();
119		-
120		- // GDPR
121		- add_filter( 'frm_is_field_required', 'FrmFieldGdpr::force_required_field', 10, 2 );
122	115	}
123	116
124	117	/**
125	118	* @return void
		@@ -132,10 +125,14 @@
132	125	add_action( 'admin_enqueue_scripts', 'FrmAppController::admin_enqueue_scripts' );
133	126	add_filter( 'plugin_action_links_' . FrmAppHelper::plugin_folder() . '/formidable.php', 'FrmAppController::settings_link' );
134	127	add_filter( 'admin_footer_text', 'FrmAppController::set_footer_text' );
135	128	add_action( 'admin_footer', 'FrmAppController::add_admin_footer_links' );
136		- add_action( 'current_screen', 'FrmAppController::handle_current_screen' );
	129	+ add_action( 'wp_ajax_frm_dismiss_review', 'FrmAppController::dismiss_review' );
137	130
	131	+ // Addons Controller.
	132	+ add_action( 'admin_menu', 'FrmAddonsController::menu', 100 );
	133	+ add_filter( 'pre_set_site_transient_update_plugins', 'FrmAddonsController::check_update' );
	134	+
138	135	// Entries Controller.
139	136	add_action( 'admin_menu', 'FrmEntriesController::menu', 12 );
140	137	add_filter( 'set-screen-option', 'FrmEntriesController::save_per_page', 10, 3 );
141	138	add_filter( 'update_user_metadata', 'FrmEntriesController::check_hidden_cols', 10, 5 );
		@@ -143,20 +140,16 @@
143	140
144	141	// Form Actions Controller.
145	142	if ( FrmAppHelper::is_admin_page( 'formidable' ) ) {
146	143	add_action( 'frm_before_update_form_settings', 'FrmFormActionsController::update_settings' );
	144	+ add_action( 'frm_add_form_style_tab_options', 'FrmFormsController::add_form_style_tab_options' );
147	145	}
148		-
149	146	add_action( 'frm_after_duplicate_form', 'FrmFormActionsController::duplicate_form_actions', 20, 3 );
150	147
151		- // Fields Model.
152		- add_filter( 'frm_pro_available_fields', 'FrmField::show_update_for_pro_fields' );
153		-
154	148	// Forms Controller.
155	149	add_action( 'admin_menu', 'FrmFormsController::menu', 10 );
156	150	add_action( 'admin_head-toplevel_page_formidable', 'FrmFormsController::head' );
157	151	add_action( 'frm_after_field_options', 'FrmFormsController::logic_tip' );
158		- add_filter( 'frm_fields_in_form_builder', 'FrmFormsController::update_form_builder_fields' );
159	152
160	153	add_filter( 'set-screen-option', 'FrmFormsController::save_per_page', 10, 3 );
161	154	add_action( 'admin_footer', 'FrmFormsController::insert_form_popup' );
162	155
		@@ -168,19 +161,23 @@
168	161
169	162	// Forms Model.
170	163	add_action( 'frm_after_duplicate_form', 'FrmForm::after_duplicate', 10, 2 );
171	164
	165	+ // Inbox Controller.
	166	+ add_action( 'admin_menu', 'FrmInboxController::menu', 50 );
	167	+
172	168	// Settings Controller.
173	169	add_action( 'admin_menu', 'FrmSettingsController::menu', 45 );
174	170	add_action( 'frm_before_settings', 'FrmSettingsController::license_box' );
175		- add_action( 'frm_after_settings_tabs', 'FrmSettingsController::settings_cta' );
	171	+ add_action( 'frm_after_settings', 'FrmSettingsController::settings_cta' );
	172	+ add_action( 'wp_ajax_frm_settings_tab', 'FrmSettingsController::load_settings_tab' );
	173	+ add_action( 'wp_ajax_frm_page_search', 'FrmSettingsController::page_search' );
176	174
177	175	// Styles Controller.
178	176	add_action( 'admin_menu', 'FrmStylesController::menu', 14 );
179	177	add_action( 'plugins_loaded', 'FrmStylesController::plugins_loaded' );
180	178	add_action( 'admin_init', 'FrmStylesController::admin_init' );
181		- // Use 11 so it happens after add_action( 'wp_default_styles', 'wp_default_styles' ); where edit.css is added.
182		- add_action( 'wp_default_styles', 'FrmStylesController::disable_conflicting_wp_admin_css', 11 );
	179	+ add_action( 'wp_default_styles', 'FrmStylesController::disable_conflicting_wp_admin_css', 11 ); // Use 11 so it happens after add_action( 'wp_default_styles', 'wp_default_styles' ); where edit.css is added.
183	180
184	181	// XML Controller.
185	182	add_action( 'admin_menu', 'FrmXMLController::menu', 41 );
186	183
		@@ -185,16 +182,15 @@
185	182	add_action( 'admin_menu', 'FrmXMLController::menu', 41 );
186	183
187	184	// Simple Blocks Controller.
188	185	add_action( 'enqueue_block_editor_assets', 'FrmSimpleBlocksController::block_editor_assets' );
189		- add_action( 'enqueue_block_assets', 'FrmSimpleBlocksController::block_assets' );
190	186
191	187	add_action( 'admin_init', 'FrmUsageController::schedule_send' );
192	188
193	189	// Applications Controller.
194		- // Use the same priority as styles so Applications appear directly under Styles.
195		- add_action( 'admin_menu', 'FrmApplicationsController::menu', 14 );
	190	+ add_action( 'admin_menu', 'FrmApplicationsController::menu', 14 ); // Use the same priority as styles so Applications appear directly under Styles.
196	191	add_action( 'admin_enqueue_scripts', 'FrmApplicationsController::dequeue_scripts', 15 );
	192	+ add_action( 'wp_ajax_frm_get_applications_data', 'FrmApplicationsController::get_applications_data' );
197	193
198	194	// CAPTCHA
199	195	add_filter( 'frm_setup_edit_field_vars', 'FrmFieldCaptcha::update_field_name' );
200	196
		@@ -203,28 +199,12 @@
203	199
204	200	// Cronjob.
205	201	add_action( 'admin_init', 'FrmCronController::schedule_events' );
206	202
207		- // Cross sell.
208		- add_action( 'admin_menu', 'FrmSalesApi::menu', 1000 );
209		-
210		- // Deactivation feedback.
211		- add_action( 'admin_enqueue_scripts', 'FrmDeactivationFeedbackController::enqueue_assets' );
212		- add_action( 'admin_footer', 'FrmDeactivationFeedbackController::footer_html' );
213		- add_action( 'deactivated_plugin', 'FrmDeactivationFeedbackController::set_feedback_expired_date' );
214		-
215		- add_action( 'frm_email_styles_extra_settings', 'FrmEmailStylesController::show_upsell_settings' );
216		-
217		- add_action( 'admin_init', 'FrmWelcomeTourController::admin_init' );
218		-
219		- FrmDashboardController::load_admin_hooks();
220	203	FrmTransLiteHooksController::load_admin_hooks();
221	204	FrmStrpLiteHooksController::load_admin_hooks();
222		- FrmSquareLiteHooksController::load_admin_hooks();
223		- FrmPayPalLiteHooksController::load_admin_hooks();
224	205	FrmSMTPController::load_hooks();
225		- FrmOnboardingWizardController::load_admin_hooks();
226		- FrmAddonsController::load_admin_hooks();
	206	+ FrmWelcomeController::load_hooks();
227	207	new FrmPluginSearch();
228	208	}
229	209
230	210	/**
		@@ -234,22 +214,14 @@
234	214	add_action( 'wp_ajax_frm_install', 'FrmAppController::ajax_install' );
235	215	add_action( 'wp_ajax_frm_uninstall', 'FrmAppController::uninstall' );
236	216	add_action( 'wp_ajax_frm_deauthorize', 'FrmAppController::deauthorize' );
237	217
238		- // Onboarding Wizard Controller.
239		- add_action( 'wp_ajax_frm_onboarding_consent_tracking', 'FrmOnboardingWizardController::ajax_consent_tracking' );
240		- add_action( 'wp_ajax_frm_onboarding_setup_usage_data', 'FrmOnboardingWizardController::setup_usage_data' );
241		-
242	218	// Addons.
243	219	add_action( 'wp_ajax_frm_addon_activate', 'FrmAddon::activate' );
244	220	add_action( 'wp_ajax_frm_addon_deactivate', 'FrmAddon::deactivate' );
245	221	add_action( 'wp_ajax_frm_activate_addon', 'FrmAddonsController::ajax_activate_addon' );
246		- add_action( 'wp_ajax_frm_deactivate_addon', 'FrmAddonsController::ajax_deactivate_addon' );
	222	+ add_action( 'wp_ajax_frm_connect', 'FrmAddonsController::connect_pro' );
247	223	add_action( 'wp_ajax_frm_install_addon', 'FrmAddonsController::ajax_install_addon' );
248		- add_action( 'wp_ajax_frm_uninstall_addon', 'FrmAddonsController::ajax_uninstall_addon' );
249		- // Plugin.
250		- add_action( 'wp_ajax_frm_install_plugin', 'FrmInstallPlugin::ajax_install_plugin' );
251		- add_action( 'wp_ajax_frm_check_plugin_activation', 'FrmInstallPlugin::ajax_check_plugin_activation' );
252	224
253	225	// Fields Controller.
254	226	add_action( 'wp_ajax_frm_load_field', 'FrmFieldsController::load_field' );
255	227	add_action( 'wp_ajax_frm_insert_field', 'FrmFieldsController::create' );
		@@ -277,9 +249,8 @@
277	249
278	250	// Form Templates Controller.
279	251	add_action( 'wp_ajax_frm_add_or_remove_favorite_template', 'FrmFormTemplatesController::ajax_add_or_remove_favorite' );
280	252	add_action( 'wp_ajax_frm_create_template', 'FrmFormTemplatesController::ajax_create_template' );
281		- add_action( 'wp_ajax_frm_get_free_templates', 'FrmFormTemplatesController::ajax_get_free_templates' );
282	253
283	254	// Inbox.
284	255	add_action( 'wp_ajax_frm_inbox_dismiss', 'FrmInboxController::dismiss_message' );
285	256
		@@ -284,10 +255,8 @@
284	255	add_action( 'wp_ajax_frm_inbox_dismiss', 'FrmInboxController::dismiss_message' );
285	256
286	257	// Settings.
287	258	add_action( 'wp_ajax_frm_lite_settings_upgrade', 'FrmSettingsController::settings_cta_dismiss' );
288		- add_action( 'wp_ajax_frm_settings_tab', 'FrmSettingsController::load_settings_tab' );
289		- add_action( 'wp_ajax_frm_page_search', 'FrmSettingsController::page_search' );
290	259
291	260	// Styles Controller.
292	261	add_action( 'wp_ajax_frm_settings_reset', 'FrmStylesController::reset_styling' );
293	262	add_action( 'wp_ajax_frm_change_styling', 'FrmStylesController::change_styling' );
		@@ -302,32 +271,13 @@
302	271	add_action( 'wp_ajax_frm_entries_csv', 'FrmXMLController::csv' );
303	272	add_action( 'wp_ajax_nopriv_frm_entries_csv', 'FrmXMLController::csv' );
304	273	add_action( 'wp_ajax_frm_export_xml', 'FrmXMLController::export_xml' );
305	274
306		- // Dashboard Controller.
307		- add_action( 'wp_ajax_dashboard_ajax_action', 'FrmDashboardController::ajax_requests' );
	275	+ // Templates API.
	276	+ add_action( 'wp_ajax_template_api_signup', 'FrmFormTemplateApi::signup' );
308	277
309	278	// Submit with AJAX.
310		- // Trigger before process_entry.
311		- add_action( 'wp_loaded', 'FrmEntriesAJAXSubmitController::ajax_create', 5 );
312		-
313		- // Track the flows usage data.
314		- add_action( 'wp_ajax_frm_track_flows', 'FrmUsageController::ajax_track_flows' );
315		-
316		- // Applications.
317		- add_action( 'wp_ajax_frm_get_applications_data', 'FrmApplicationsController::get_applications_data' );
318		-
319		- // Reviews.
320		- add_action( 'wp_ajax_frm_dismiss_review', 'FrmAppController::dismiss_review' );
321		- add_action( 'wp_ajax_frm_small_screen_proceed', 'FrmAppController::small_screen_proceed' );
322		- add_action( 'wp_ajax_frm_sale_banner_dismiss', 'FrmSalesApi::dismiss_banner' );
323		-
324		- add_action( 'wp_ajax_frm_email_style_preview', 'FrmEmailStylesController::ajax_preview' );
325		- add_action( 'wp_ajax_frm_send_test_email', 'FrmEmailStylesController::ajax_send_test_email' );
326		-
327		- // Welcome Tour.
328		- add_action( 'wp_ajax_frm_mark_checklist_step_as_completed', 'FrmWelcomeTourController::ajax_mark_checklist_step_as_completed' );
329		- add_action( 'wp_ajax_frm_dismiss_welcome_tour', 'FrmWelcomeTourController::ajax_dismiss_welcome_tour' );
	279	+ add_action( 'wp_loaded', 'FrmEntriesAJAXSubmitController::ajax_create', 5 ); // Trigger before process_entry.
330	280	}
331	281
332	282	/**
333	283	* @return void
		@@ -339,14 +289,12 @@
339	289	add_filter( 'frm_field_value_saved', 'FrmFieldsController::check_value', 50, 3 );
340	290	add_filter( 'frm_field_label_seen', 'FrmFieldsController::check_label' );
341	291
342	292	// Forms Controller.
343		- add_action( 'frm_form_classes', 'FrmFormsController::form_classes' );
	293	+ add_filter( 'frm_form_classes', 'FrmFormsController::form_classes' );
344	294	add_filter( 'frm_submit_button_class', 'FrmFormsController::update_button_classes' );
345	295	add_filter( 'frm_back_button_class', 'FrmFormsController::update_button_classes' );
346	296
347		- add_filter( 'frm_pre_display_form', 'FrmSubmitHelper::copy_submit_field_settings_to_form' );
348		-
349	297	// Styles Controller.
350	298	add_filter( 'frm_use_important_width', 'FrmStylesController::important_style', 10, 2 );
351	299	}
352	300
		@@ -364,6 +312,16 @@
364	312	add_action( 'wpmu_upgrade_site', 'FrmAppController::network_upgrade_site' );
365	313
366	314	// Drop tables when mu site is deleted.
367	315	add_filter( 'wpmu_drop_tables', 'FrmAppController::drop_tables' );
	316	+ }
	317	+
	318	+ /**
	319	+ * @deprecated 5.0.06 use FrmElementorController::register_elementor_hooks directly.
	320	+ *
	321	+ * @return void
	322	+ */
	323	+ public static function register_elementor_hooks() {
	324	+ _deprecated_function( __FUNCTION__, '5.0.06', 'FrmElementorController::register_elementor_hooks' );
	325	+ FrmElementorController::register_elementor_hooks();
368	326	}
369	327	}