← All changes | classes/controllers/FrmHooksController.php +8 -35 6.31 → 6.18 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,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,9 +125,9 @@
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( 'current_screen', 'FrmAppController::filter_admin_notices' );
137	130
138	131	// Entries Controller.
139	132	add_action( 'admin_menu', 'FrmEntriesController::menu', 12 );
140	133	add_filter( 'set-screen-option', 'FrmEntriesController::save_per_page', 10, 3 );
		@@ -147,16 +140,13 @@
147	140	}
148	141
149	142	add_action( 'frm_after_duplicate_form', 'FrmFormActionsController::duplicate_form_actions', 20, 3 );
150	143
151		- // Fields Model.
152		- add_filter( 'frm_pro_available_fields', 'FrmField::show_update_for_pro_fields' );
153		-
154	144	// Forms Controller.
155	145	add_action( 'admin_menu', 'FrmFormsController::menu', 10 );
156	146	add_action( 'admin_head-toplevel_page_formidable', 'FrmFormsController::head' );
157	147	add_action( 'frm_after_field_options', 'FrmFormsController::logic_tip' );
158		- 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 );
159	149
160	150	add_filter( 'set-screen-option', 'FrmFormsController::save_per_page', 10, 3 );
161	151	add_action( 'admin_footer', 'FrmFormsController::insert_form_popup' );
162	152
		@@ -185,9 +175,8 @@
185	175	add_action( 'admin_menu', 'FrmXMLController::menu', 41 );
186	176
187	177	// Simple Blocks Controller.
188	178	add_action( 'enqueue_block_editor_assets', 'FrmSimpleBlocksController::block_editor_assets' );
189		- add_action( 'enqueue_block_assets', 'FrmSimpleBlocksController::block_assets' );
190	179
191	180	add_action( 'admin_init', 'FrmUsageController::schedule_send' );
192	181
193	182	// Applications Controller.
		@@ -203,25 +192,16 @@
203	192
204	193	// Cronjob.
205	194	add_action( 'admin_init', 'FrmCronController::schedule_events' );
206	195
207		- // Cross sell.
208		- add_action( 'admin_menu', 'FrmSalesApi::menu', 1000 );
209		-
210	196	// Deactivation feedback.
211	197	add_action( 'admin_enqueue_scripts', 'FrmDeactivationFeedbackController::enqueue_assets' );
212	198	add_action( 'admin_footer', 'FrmDeactivationFeedbackController::footer_html' );
213	199	add_action( 'deactivated_plugin', 'FrmDeactivationFeedbackController::set_feedback_expired_date' );
214	200
215		- add_action( 'frm_email_styles_extra_settings', 'FrmEmailStylesController::show_upsell_settings' );
216		-
217		- add_action( 'admin_init', 'FrmWelcomeTourController::admin_init' );
218		-
219	201	FrmDashboardController::load_admin_hooks();
220	202	FrmTransLiteHooksController::load_admin_hooks();
221	203	FrmStrpLiteHooksController::load_admin_hooks();
222		- FrmSquareLiteHooksController::load_admin_hooks();
223		- FrmPayPalLiteHooksController::load_admin_hooks();
224	204	FrmSMTPController::load_hooks();
225	205	FrmOnboardingWizardController::load_admin_hooks();
226	206	FrmAddonsController::load_admin_hooks();
227	207	new FrmPluginSearch();
		@@ -277,9 +257,8 @@
277	257
278	258	// Form Templates Controller.
279	259	add_action( 'wp_ajax_frm_add_or_remove_favorite_template', 'FrmFormTemplatesController::ajax_add_or_remove_favorite' );
280	260	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	261
283	262	// Inbox.
284	263	add_action( 'wp_ajax_frm_inbox_dismiss', 'FrmInboxController::dismiss_message' );
285	264
		@@ -302,8 +281,11 @@
302	281	add_action( 'wp_ajax_frm_entries_csv', 'FrmXMLController::csv' );
303	282	add_action( 'wp_ajax_nopriv_frm_entries_csv', 'FrmXMLController::csv' );
304	283	add_action( 'wp_ajax_frm_export_xml', 'FrmXMLController::export_xml' );
305	284
	285	+ // Templates API.
	286	+ add_action( 'wp_ajax_template_api_signup', 'FrmFormTemplateApi::signup' );
	287	+
306	288	// Dashboard Controller.
307	289	add_action( 'wp_ajax_dashboard_ajax_action', 'FrmDashboardController::ajax_requests' );
308	290
309	291	// Submit with AJAX.
		@@ -317,17 +299,8 @@
317	299	add_action( 'wp_ajax_frm_get_applications_data', 'FrmApplicationsController::get_applications_data' );
318	300
319	301	// Reviews.
320	302	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' );
330	303	}
331	304
332	305	/**
333	306	* @return void