← All changes | classes/controllers/FrmHooksController.php +8 -30 6.28 → 6.17 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	}
		@@ -71,9 +71,8 @@
71	71
72	72	// Form Actions Controller.
73	73	add_action( 'init', 'FrmFormActionsController::register_post_types', 1 );
74	74	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	75
77	76	// Forms Controller.
78	77	add_action( 'widgets_init', 'FrmFormsController::register_widgets' );
79	78	add_action( 'init', 'FrmFormsController::front_head' );
		@@ -80,9 +79,8 @@
80	79	add_filter( 'frm_content', 'FrmFormsController::filter_content', 10, 3 );
81	80	add_filter( 'frm_replace_content_shortcodes', 'FrmFormsController::replace_content_shortcodes', 20, 3 );
82	81	add_action( 'admin_bar_init', 'FrmFormsController::admin_bar_css' );
83	82	add_action( 'wp_footer', 'FrmFormsController::footer_js', 1, 0 );
84		- add_action( 'wp_footer', 'FrmHoneypot::maybe_print_honeypot_js', 99 );
85	83
86	84	add_action( 'wp_scheduled_delete', 'FrmForm::scheduled_delete' );
87	85
88	86	// Form Shortcodes.
		@@ -113,12 +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		-
119		- // GDPR
120		- add_filter( 'frm_is_field_required', 'FrmFieldGdpr::force_required_field', 10, 2 );
121	115	}
122	116
123	117	/**
124	118	* @return void
		@@ -131,9 +125,9 @@
131	125	add_action( 'admin_enqueue_scripts', 'FrmAppController::admin_enqueue_scripts' );
132	126	add_filter( 'plugin_action_links_' . FrmAppHelper::plugin_folder() . '/formidable.php', 'FrmAppController::settings_link' );
133	127	add_filter( 'admin_footer_text', 'FrmAppController::set_footer_text' );
134	128	add_action( 'admin_footer', 'FrmAppController::add_admin_footer_links' );
135		- add_action( 'current_screen', 'FrmAppController::handle_current_screen' );
	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 );
		@@ -150,9 +144,9 @@
150	144	// Forms Controller.
151	145	add_action( 'admin_menu', 'FrmFormsController::menu', 10 );
152	146	add_action( 'admin_head-toplevel_page_formidable', 'FrmFormsController::head' );
153	147	add_action( 'frm_after_field_options', 'FrmFormsController::logic_tip' );
154		- add_filter( 'frm_fields_in_form_builder', 'FrmFormsController::update_form_builder_fields' );
	148	+ add_filter( 'frm_fields_in_form_builder', 'FrmFormsController::update_form_builder_fields', 10, 2 );
155	149
156	150	add_filter( 'set-screen-option', 'FrmFormsController::save_per_page', 10, 3 );
157	151	add_action( 'admin_footer', 'FrmFormsController::insert_form_popup' );
158	152
		@@ -181,9 +175,8 @@
181	175	add_action( 'admin_menu', 'FrmXMLController::menu', 41 );
182	176
183	177	// Simple Blocks Controller.
184	178	add_action( 'enqueue_block_editor_assets', 'FrmSimpleBlocksController::block_editor_assets' );
185		- add_action( 'enqueue_block_assets', 'FrmSimpleBlocksController::block_assets' );
186	179
187	180	add_action( 'admin_init', 'FrmUsageController::schedule_send' );
188	181
189	182	// Applications Controller.
		@@ -199,24 +192,16 @@
199	192
200	193	// Cronjob.
201	194	add_action( 'admin_init', 'FrmCronController::schedule_events' );
202	195
203		- // Cross sell.
204		- add_action( 'admin_menu', 'FrmSalesApi::menu', 1000 );
205		-
206	196	// Deactivation feedback.
207	197	add_action( 'admin_enqueue_scripts', 'FrmDeactivationFeedbackController::enqueue_assets' );
208	198	add_action( 'admin_footer', 'FrmDeactivationFeedbackController::footer_html' );
209	199	add_action( 'deactivated_plugin', 'FrmDeactivationFeedbackController::set_feedback_expired_date' );
210	200
211		- add_action( 'frm_email_styles_extra_settings', 'FrmEmailStylesController::show_upsell_settings' );
212		-
213		- add_action( 'admin_init', 'FrmWelcomeTourController::admin_init' );
214		-
215	201	FrmDashboardController::load_admin_hooks();
216	202	FrmTransLiteHooksController::load_admin_hooks();
217	203	FrmStrpLiteHooksController::load_admin_hooks();
218		- FrmSquareLiteHooksController::load_admin_hooks();
219	204	FrmSMTPController::load_hooks();
220	205	FrmOnboardingWizardController::load_admin_hooks();
221	206	FrmAddonsController::load_admin_hooks();
222	207	new FrmPluginSearch();
		@@ -272,9 +257,8 @@
272	257
273	258	// Form Templates Controller.
274	259	add_action( 'wp_ajax_frm_add_or_remove_favorite_template', 'FrmFormTemplatesController::ajax_add_or_remove_favorite' );
275	260	add_action( 'wp_ajax_frm_create_template', 'FrmFormTemplatesController::ajax_create_template' );
276		- add_action( 'wp_ajax_frm_get_free_templates', 'FrmFormTemplatesController::ajax_get_free_templates' );
277	261
278	262	// Inbox.
279	263	add_action( 'wp_ajax_frm_inbox_dismiss', 'FrmInboxController::dismiss_message' );
280	264
		@@ -297,8 +281,11 @@
297	281	add_action( 'wp_ajax_frm_entries_csv', 'FrmXMLController::csv' );
298	282	add_action( 'wp_ajax_nopriv_frm_entries_csv', 'FrmXMLController::csv' );
299	283	add_action( 'wp_ajax_frm_export_xml', 'FrmXMLController::export_xml' );
300	284
	285	+ // Templates API.
	286	+ add_action( 'wp_ajax_template_api_signup', 'FrmFormTemplateApi::signup' );
	287	+
301	288	// Dashboard Controller.
302	289	add_action( 'wp_ajax_dashboard_ajax_action', 'FrmDashboardController::ajax_requests' );
303	290
304	291	// Submit with AJAX.
		@@ -312,17 +299,8 @@
312	299	add_action( 'wp_ajax_frm_get_applications_data', 'FrmApplicationsController::get_applications_data' );
313	300
314	301	// Reviews.
315	302	add_action( 'wp_ajax_frm_dismiss_review', 'FrmAppController::dismiss_review' );
316		- add_action( 'wp_ajax_frm_small_screen_proceed', 'FrmAppController::small_screen_proceed' );
317		- add_action( 'wp_ajax_frm_sale_banner_dismiss', 'FrmSalesApi::dismiss_banner' );
318		-
319		- add_action( 'wp_ajax_frm_email_style_preview', 'FrmEmailStylesController::ajax_preview' );
320		- add_action( 'wp_ajax_frm_send_test_email', 'FrmEmailStylesController::ajax_send_test_email' );
321		-
322		- // Welcome Tour.
323		- add_action( 'wp_ajax_frm_mark_checklist_step_as_completed', 'FrmWelcomeTourController::ajax_mark_checklist_step_as_completed' );
324		- add_action( 'wp_ajax_frm_dismiss_welcome_tour', 'FrmWelcomeTourController::ajax_dismiss_welcome_tour' );
325	303	}
326	304
327	305	/**
328	306	* @return void