← All changes | classes/controllers/FrmHooksController.php +21 -58 6.30 → 6.10 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 ) );
		@@ -58,12 +58,10 @@
58	58	/**
59	59	* @return void
60	60	*/
61	61	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	62	add_action( 'rest_api_init', 'FrmAppController::create_rest_routes', 0 );
	63	+ add_action( 'plugins_loaded', 'FrmAppController::load_lang' );
66	64	add_filter( 'widget_text', 'do_shortcode' );
67	65
68	66	// Entries controller.
69	67	add_action( 'wp_loaded', 'FrmEntriesController::process_entry', 10, 0 );
		@@ -71,9 +69,8 @@
71	69
72	70	// Form Actions Controller.
73	71	add_action( 'init', 'FrmFormActionsController::register_post_types', 1 );
74	72	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	73
77	74	// Forms Controller.
78	75	add_action( 'widgets_init', 'FrmFormsController::register_widgets' );
79	76	add_action( 'init', 'FrmFormsController::front_head' );
		@@ -80,9 +77,8 @@
80	77	add_filter( 'frm_content', 'FrmFormsController::filter_content', 10, 3 );
81	78	add_filter( 'frm_replace_content_shortcodes', 'FrmFormsController::replace_content_shortcodes', 20, 3 );
82	79	add_action( 'admin_bar_init', 'FrmFormsController::admin_bar_css' );
83	80	add_action( 'wp_footer', 'FrmFormsController::footer_js', 1, 0 );
84		- add_action( 'wp_footer', 'FrmHoneypot::maybe_print_honeypot_js', 99 );
85	81
86	82	add_action( 'wp_scheduled_delete', 'FrmForm::scheduled_delete' );
87	83
88	84	// Form Shortcodes.
		@@ -107,8 +103,9 @@
107	103	add_filter( 'frm_keep_name_value_array', '__return_true' );
108	104
109	105	// Elementor.
110	106	add_action( 'elementor/widgets/register', 'FrmElementorController::register_elementor_hooks' );
	107	+ add_filter( 'frm_fields_in_form_builder', 'FrmFormsController::update_form_builder_fields', 10, 2 );
111	108
112	109	// Summary emails.
113	110	add_action( 'frm_daily_event', 'FrmEmailSummaryController::maybe_send_emails' );
114	111
		@@ -113,12 +110,8 @@
113	110	add_action( 'frm_daily_event', 'FrmEmailSummaryController::maybe_send_emails' );
114	111
115	112	FrmTransLiteHooksController::load_hooks();
116	113	FrmStrpLiteHooksController::load_hooks();
117		- FrmSquareLiteHooksController::load_hooks();
118		-
119		- // GDPR
120		- add_filter( 'frm_is_field_required', 'FrmFieldGdpr::force_required_field', 10, 2 );
121	114	}
122	115
123	116	/**
124	117	* @return void
		@@ -131,10 +124,14 @@
131	124	add_action( 'admin_enqueue_scripts', 'FrmAppController::admin_enqueue_scripts' );
132	125	add_filter( 'plugin_action_links_' . FrmAppHelper::plugin_folder() . '/formidable.php', 'FrmAppController::settings_link' );
133	126	add_filter( 'admin_footer_text', 'FrmAppController::set_footer_text' );
134	127	add_action( 'admin_footer', 'FrmAppController::add_admin_footer_links' );
135		- add_action( 'current_screen', 'FrmAppController::handle_current_screen' );
	128	+ add_action( 'wp_ajax_frm_dismiss_review', 'FrmAppController::dismiss_review' );
136	129
	130	+ // Addons Controller.
	131	+ add_action( 'admin_menu', 'FrmAddonsController::menu', 100 );
	132	+ add_filter( 'pre_set_site_transient_update_plugins', 'FrmAddonsController::check_update' );
	133	+
137	134	// Entries Controller.
138	135	add_action( 'admin_menu', 'FrmEntriesController::menu', 12 );
139	136	add_filter( 'set-screen-option', 'FrmEntriesController::save_per_page', 10, 3 );
140	137	add_filter( 'update_user_metadata', 'FrmEntriesController::check_hidden_cols', 10, 5 );
		@@ -142,20 +139,16 @@
142	139
143	140	// Form Actions Controller.
144	141	if ( FrmAppHelper::is_admin_page( 'formidable' ) ) {
145	142	add_action( 'frm_before_update_form_settings', 'FrmFormActionsController::update_settings' );
	143	+ add_action( 'frm_add_form_style_tab_options', 'FrmFormsController::add_form_style_tab_options' );
146	144	}
147		-
148	145	add_action( 'frm_after_duplicate_form', 'FrmFormActionsController::duplicate_form_actions', 20, 3 );
149	146
150		- // Fields Model.
151		- add_filter( 'frm_pro_available_fields', 'FrmField::show_update_for_pro_fields' );
152		-
153	147	// Forms Controller.
154	148	add_action( 'admin_menu', 'FrmFormsController::menu', 10 );
155	149	add_action( 'admin_head-toplevel_page_formidable', 'FrmFormsController::head' );
156	150	add_action( 'frm_after_field_options', 'FrmFormsController::logic_tip' );
157		- add_filter( 'frm_fields_in_form_builder', 'FrmFormsController::update_form_builder_fields' );
158	151
159	152	add_filter( 'set-screen-option', 'FrmFormsController::save_per_page', 10, 3 );
160	153	add_action( 'admin_footer', 'FrmFormsController::insert_form_popup' );
161	154
		@@ -170,9 +163,11 @@
170	163
171	164	// Settings Controller.
172	165	add_action( 'admin_menu', 'FrmSettingsController::menu', 45 );
173	166	add_action( 'frm_before_settings', 'FrmSettingsController::license_box' );
174		- add_action( 'frm_after_settings_tabs', 'FrmSettingsController::settings_cta' );
	167	+ add_action( 'frm_after_settings', 'FrmSettingsController::settings_cta' );
	168	+ add_action( 'wp_ajax_frm_settings_tab', 'FrmSettingsController::load_settings_tab' );
	169	+ add_action( 'wp_ajax_frm_page_search', 'FrmSettingsController::page_search' );
175	170
176	171	// Styles Controller.
177	172	add_action( 'admin_menu', 'FrmStylesController::menu', 14 );
178	173	add_action( 'plugins_loaded', 'FrmStylesController::plugins_loaded' );
		@@ -184,9 +179,8 @@
184	179	add_action( 'admin_menu', 'FrmXMLController::menu', 41 );
185	180
186	181	// Simple Blocks Controller.
187	182	add_action( 'enqueue_block_editor_assets', 'FrmSimpleBlocksController::block_editor_assets' );
188		- add_action( 'enqueue_block_assets', 'FrmSimpleBlocksController::block_assets' );
189	183
190	184	add_action( 'admin_init', 'FrmUsageController::schedule_send' );
191	185
192	186	// Applications Controller.
		@@ -192,8 +186,9 @@
192	186	// Applications Controller.
193	187	// Use the same priority as styles so Applications appear directly under Styles.
194	188	add_action( 'admin_menu', 'FrmApplicationsController::menu', 14 );
195	189	add_action( 'admin_enqueue_scripts', 'FrmApplicationsController::dequeue_scripts', 15 );
	190	+ add_action( 'wp_ajax_frm_get_applications_data', 'FrmApplicationsController::get_applications_data' );
196	191
197	192	// CAPTCHA
198	193	add_filter( 'frm_setup_edit_field_vars', 'FrmFieldCaptcha::update_field_name' );
199	194
		@@ -202,27 +197,13 @@
202	197
203	198	// Cronjob.
204	199	add_action( 'admin_init', 'FrmCronController::schedule_events' );
205	200
206		- // Cross sell.
207		- add_action( 'admin_menu', 'FrmSalesApi::menu', 1000 );
208		-
209		- // Deactivation feedback.
210		- add_action( 'admin_enqueue_scripts', 'FrmDeactivationFeedbackController::enqueue_assets' );
211		- add_action( 'admin_footer', 'FrmDeactivationFeedbackController::footer_html' );
212		- add_action( 'deactivated_plugin', 'FrmDeactivationFeedbackController::set_feedback_expired_date' );
213		-
214		- add_action( 'frm_email_styles_extra_settings', 'FrmEmailStylesController::show_upsell_settings' );
215		-
216		- add_action( 'admin_init', 'FrmWelcomeTourController::admin_init' );
217		-
218	201	FrmDashboardController::load_admin_hooks();
219	202	FrmTransLiteHooksController::load_admin_hooks();
220	203	FrmStrpLiteHooksController::load_admin_hooks();
221		- FrmSquareLiteHooksController::load_admin_hooks();
222	204	FrmSMTPController::load_hooks();
223	205	FrmOnboardingWizardController::load_admin_hooks();
224		- FrmAddonsController::load_admin_hooks();
225	206	new FrmPluginSearch();
226	207	}
227	208
228	209	/**
		@@ -233,9 +214,9 @@
233	214	add_action( 'wp_ajax_frm_uninstall', 'FrmAppController::uninstall' );
234	215	add_action( 'wp_ajax_frm_deauthorize', 'FrmAppController::deauthorize' );
235	216
236	217	// Onboarding Wizard Controller.
237		- add_action( 'wp_ajax_frm_onboarding_consent_tracking', 'FrmOnboardingWizardController::ajax_consent_tracking' );
	218	+ add_action( 'wp_ajax_frm_onboarding_setup_email_step', 'FrmOnboardingWizardController::ajax_setup_email_step' );
238	219	add_action( 'wp_ajax_frm_onboarding_setup_usage_data', 'FrmOnboardingWizardController::setup_usage_data' );
239	220
240	221	// Addons.
241	222	add_action( 'wp_ajax_frm_addon_activate', 'FrmAddon::activate' );
		@@ -275,9 +256,8 @@
275	256
276	257	// Form Templates Controller.
277	258	add_action( 'wp_ajax_frm_add_or_remove_favorite_template', 'FrmFormTemplatesController::ajax_add_or_remove_favorite' );
278	259	add_action( 'wp_ajax_frm_create_template', 'FrmFormTemplatesController::ajax_create_template' );
279		- add_action( 'wp_ajax_frm_get_free_templates', 'FrmFormTemplatesController::ajax_get_free_templates' );
280	260
281	261	// Inbox.
282	262	add_action( 'wp_ajax_frm_inbox_dismiss', 'FrmInboxController::dismiss_message' );
283	263
		@@ -282,10 +262,8 @@
282	262	add_action( 'wp_ajax_frm_inbox_dismiss', 'FrmInboxController::dismiss_message' );
283	263
284	264	// Settings.
285	265	add_action( 'wp_ajax_frm_lite_settings_upgrade', 'FrmSettingsController::settings_cta_dismiss' );
286		- add_action( 'wp_ajax_frm_settings_tab', 'FrmSettingsController::load_settings_tab' );
287		- add_action( 'wp_ajax_frm_page_search', 'FrmSettingsController::page_search' );
288	266
289	267	// Styles Controller.
290	268	add_action( 'wp_ajax_frm_settings_reset', 'FrmStylesController::reset_styling' );
291	269	add_action( 'wp_ajax_frm_change_styling', 'FrmStylesController::change_styling' );
		@@ -300,8 +278,11 @@
300	278	add_action( 'wp_ajax_frm_entries_csv', 'FrmXMLController::csv' );
301	279	add_action( 'wp_ajax_nopriv_frm_entries_csv', 'FrmXMLController::csv' );
302	280	add_action( 'wp_ajax_frm_export_xml', 'FrmXMLController::export_xml' );
303	281
	282	+ // Templates API.
	283	+ add_action( 'wp_ajax_template_api_signup', 'FrmFormTemplateApi::signup' );
	284	+
304	285	// Dashboard Controller.
305	286	add_action( 'wp_ajax_dashboard_ajax_action', 'FrmDashboardController::ajax_requests' );
306	287
307	288	// Submit with AJAX.
		@@ -306,26 +287,8 @@
306	287
307	288	// Submit with AJAX.
308	289	// Trigger before process_entry.
309	290	add_action( 'wp_loaded', 'FrmEntriesAJAXSubmitController::ajax_create', 5 );
310		-
311		- // Track the flows usage data.
312		- add_action( 'wp_ajax_frm_track_flows', 'FrmUsageController::ajax_track_flows' );
313		-
314		- // Applications.
315		- add_action( 'wp_ajax_frm_get_applications_data', 'FrmApplicationsController::get_applications_data' );
316		-
317		- // Reviews.
318		- add_action( 'wp_ajax_frm_dismiss_review', 'FrmAppController::dismiss_review' );
319		- add_action( 'wp_ajax_frm_small_screen_proceed', 'FrmAppController::small_screen_proceed' );
320		- add_action( 'wp_ajax_frm_sale_banner_dismiss', 'FrmSalesApi::dismiss_banner' );
321		-
322		- add_action( 'wp_ajax_frm_email_style_preview', 'FrmEmailStylesController::ajax_preview' );
323		- add_action( 'wp_ajax_frm_send_test_email', 'FrmEmailStylesController::ajax_send_test_email' );
324		-
325		- // Welcome Tour.
326		- add_action( 'wp_ajax_frm_mark_checklist_step_as_completed', 'FrmWelcomeTourController::ajax_mark_checklist_step_as_completed' );
327		- add_action( 'wp_ajax_frm_dismiss_welcome_tour', 'FrmWelcomeTourController::ajax_dismiss_welcome_tour' );
328	291	}
329	292
330	293	/**
331	294	* @return void
		@@ -337,9 +300,9 @@
337	300	add_filter( 'frm_field_value_saved', 'FrmFieldsController::check_value', 50, 3 );
338	301	add_filter( 'frm_field_label_seen', 'FrmFieldsController::check_label' );
339	302
340	303	// Forms Controller.
341		- add_action( 'frm_form_classes', 'FrmFormsController::form_classes' );
	304	+ add_filter( 'frm_form_classes', 'FrmFormsController::form_classes' );
342	305	add_filter( 'frm_submit_button_class', 'FrmFormsController::update_button_classes' );
343	306	add_filter( 'frm_back_button_class', 'FrmFormsController::update_button_classes' );
344	307
345	308	add_filter( 'frm_pre_display_form', 'FrmSubmitHelper::copy_submit_field_settings_to_form' );