← All changes | classes/controllers/FrmHooksController.php +15 -49 6.30 → 6.16 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	}
		@@ -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,9 +124,10 @@
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' );
	129	+ add_action( 'current_screen', 'FrmAppController::filter_admin_notices' );
136	130
137	131	// Entries Controller.
138	132	add_action( 'admin_menu', 'FrmEntriesController::menu', 12 );
139	133	add_filter( 'set-screen-option', 'FrmEntriesController::save_per_page', 10, 3 );
		@@ -142,20 +136,16 @@
142	136
143	137	// Form Actions Controller.
144	138	if ( FrmAppHelper::is_admin_page( 'formidable' ) ) {
145	139	add_action( 'frm_before_update_form_settings', 'FrmFormActionsController::update_settings' );
	140	+ add_action( 'frm_add_form_style_tab_options', 'FrmFormsController::add_form_style_tab_options' );
146	141	}
147		-
148	142	add_action( 'frm_after_duplicate_form', 'FrmFormActionsController::duplicate_form_actions', 20, 3 );
149	143
150		- // Fields Model.
151		- add_filter( 'frm_pro_available_fields', 'FrmField::show_update_for_pro_fields' );
152		-
153	144	// Forms Controller.
154	145	add_action( 'admin_menu', 'FrmFormsController::menu', 10 );
155	146	add_action( 'admin_head-toplevel_page_formidable', 'FrmFormsController::head' );
156	147	add_action( 'frm_after_field_options', 'FrmFormsController::logic_tip' );
157		- add_filter( 'frm_fields_in_form_builder', 'FrmFormsController::update_form_builder_fields' );
158	148
159	149	add_filter( 'set-screen-option', 'FrmFormsController::save_per_page', 10, 3 );
160	150	add_action( 'admin_footer', 'FrmFormsController::insert_form_popup' );
161	151
		@@ -170,9 +160,11 @@
170	160
171	161	// Settings Controller.
172	162	add_action( 'admin_menu', 'FrmSettingsController::menu', 45 );
173	163	add_action( 'frm_before_settings', 'FrmSettingsController::license_box' );
174		- add_action( 'frm_after_settings_tabs', 'FrmSettingsController::settings_cta' );
	164	+ add_action( 'frm_after_settings', 'FrmSettingsController::settings_cta' );
	165	+ add_action( 'wp_ajax_frm_settings_tab', 'FrmSettingsController::load_settings_tab' );
	166	+ add_action( 'wp_ajax_frm_page_search', 'FrmSettingsController::page_search' );
175	167
176	168	// Styles Controller.
177	169	add_action( 'admin_menu', 'FrmStylesController::menu', 14 );
178	170	add_action( 'plugins_loaded', 'FrmStylesController::plugins_loaded' );
		@@ -184,9 +176,8 @@
184	176	add_action( 'admin_menu', 'FrmXMLController::menu', 41 );
185	177
186	178	// Simple Blocks Controller.
187	179	add_action( 'enqueue_block_editor_assets', 'FrmSimpleBlocksController::block_editor_assets' );
188		- add_action( 'enqueue_block_assets', 'FrmSimpleBlocksController::block_assets' );
189	180
190	181	add_action( 'admin_init', 'FrmUsageController::schedule_send' );
191	182
192	183	// Applications Controller.
		@@ -192,8 +183,9 @@
192	183	// Applications Controller.
193	184	// Use the same priority as styles so Applications appear directly under Styles.
194	185	add_action( 'admin_menu', 'FrmApplicationsController::menu', 14 );
195	186	add_action( 'admin_enqueue_scripts', 'FrmApplicationsController::dequeue_scripts', 15 );
	187	+ add_action( 'wp_ajax_frm_get_applications_data', 'FrmApplicationsController::get_applications_data' );
196	188
197	189	// CAPTCHA
198	190	add_filter( 'frm_setup_edit_field_vars', 'FrmFieldCaptcha::update_field_name' );
199	191
		@@ -202,24 +194,16 @@
202	194
203	195	// Cronjob.
204	196	add_action( 'admin_init', 'FrmCronController::schedule_events' );
205	197
206		- // Cross sell.
207		- add_action( 'admin_menu', 'FrmSalesApi::menu', 1000 );
208		-
209	198	// Deactivation feedback.
210	199	add_action( 'admin_enqueue_scripts', 'FrmDeactivationFeedbackController::enqueue_assets' );
211	200	add_action( 'admin_footer', 'FrmDeactivationFeedbackController::footer_html' );
212	201	add_action( 'deactivated_plugin', 'FrmDeactivationFeedbackController::set_feedback_expired_date' );
213	202
214		- add_action( 'frm_email_styles_extra_settings', 'FrmEmailStylesController::show_upsell_settings' );
215		-
216		- add_action( 'admin_init', 'FrmWelcomeTourController::admin_init' );
217		-
218	203	FrmDashboardController::load_admin_hooks();
219	204	FrmTransLiteHooksController::load_admin_hooks();
220	205	FrmStrpLiteHooksController::load_admin_hooks();
221		- FrmSquareLiteHooksController::load_admin_hooks();
222	206	FrmSMTPController::load_hooks();
223	207	FrmOnboardingWizardController::load_admin_hooks();
224	208	FrmAddonsController::load_admin_hooks();
225	209	new FrmPluginSearch();
		@@ -275,9 +259,8 @@
275	259
276	260	// Form Templates Controller.
277	261	add_action( 'wp_ajax_frm_add_or_remove_favorite_template', 'FrmFormTemplatesController::ajax_add_or_remove_favorite' );
278	262	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	263
281	264	// Inbox.
282	265	add_action( 'wp_ajax_frm_inbox_dismiss', 'FrmInboxController::dismiss_message' );
283	266
		@@ -282,10 +265,8 @@
282	265	add_action( 'wp_ajax_frm_inbox_dismiss', 'FrmInboxController::dismiss_message' );
283	266
284	267	// Settings.
285	268	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	269
289	270	// Styles Controller.
290	271	add_action( 'wp_ajax_frm_settings_reset', 'FrmStylesController::reset_styling' );
291	272	add_action( 'wp_ajax_frm_change_styling', 'FrmStylesController::change_styling' );
		@@ -300,8 +281,11 @@
300	281	add_action( 'wp_ajax_frm_entries_csv', 'FrmXMLController::csv' );
301	282	add_action( 'wp_ajax_nopriv_frm_entries_csv', 'FrmXMLController::csv' );
302	283	add_action( 'wp_ajax_frm_export_xml', 'FrmXMLController::export_xml' );
303	284
	285	+ // Templates API.
	286	+ add_action( 'wp_ajax_template_api_signup', 'FrmFormTemplateApi::signup' );
	287	+
304	288	// Dashboard Controller.
305	289	add_action( 'wp_ajax_dashboard_ajax_action', 'FrmDashboardController::ajax_requests' );
306	290
307	291	// Submit with AJAX.
		@@ -306,26 +290,8 @@
306	290
307	291	// Submit with AJAX.
308	292	// Trigger before process_entry.
309	293	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	294	}
329	295
330	296	/**
331	297	* @return void