← All changes | classes/controllers/FrmHooksController.php +4 -25 6.27 → 6.20 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	}
		@@ -80,9 +80,8 @@
80	80	add_filter( 'frm_content', 'FrmFormsController::filter_content', 10, 3 );
81	81	add_filter( 'frm_replace_content_shortcodes', 'FrmFormsController::replace_content_shortcodes', 20, 3 );
82	82	add_action( 'admin_bar_init', 'FrmFormsController::admin_bar_css' );
83	83	add_action( 'wp_footer', 'FrmFormsController::footer_js', 1, 0 );
84		- add_action( 'wp_footer', 'FrmHoneypot::maybe_print_honeypot_js', 99 );
85	84
86	85	add_action( 'wp_scheduled_delete', 'FrmForm::scheduled_delete' );
87	86
88	87	// Form Shortcodes.
		@@ -113,9 +112,8 @@
113	112	add_action( 'frm_daily_event', 'FrmEmailSummaryController::maybe_send_emails' );
114	113
115	114	FrmTransLiteHooksController::load_hooks();
116	115	FrmStrpLiteHooksController::load_hooks();
117		- FrmSquareLiteHooksController::load_hooks();
118	116
119	117	// GDPR
120	118	add_filter( 'frm_is_field_required', 'FrmFieldGdpr::force_required_field', 10, 2 );
121	119	}
		@@ -150,9 +148,9 @@
150	148	// Forms Controller.
151	149	add_action( 'admin_menu', 'FrmFormsController::menu', 10 );
152	150	add_action( 'admin_head-toplevel_page_formidable', 'FrmFormsController::head' );
153	151	add_action( 'frm_after_field_options', 'FrmFormsController::logic_tip' );
154		- add_filter( 'frm_fields_in_form_builder', 'FrmFormsController::update_form_builder_fields' );
	152	+ add_filter( 'frm_fields_in_form_builder', 'FrmFormsController::update_form_builder_fields', 10, 2 );
155	153
156	154	add_filter( 'set-screen-option', 'FrmFormsController::save_per_page', 10, 3 );
157	155	add_action( 'admin_footer', 'FrmFormsController::insert_form_popup' );
158	156
		@@ -181,9 +179,8 @@
181	179	add_action( 'admin_menu', 'FrmXMLController::menu', 41 );
182	180
183	181	// Simple Blocks Controller.
184	182	add_action( 'enqueue_block_editor_assets', 'FrmSimpleBlocksController::block_editor_assets' );
185		- add_action( 'enqueue_block_assets', 'FrmSimpleBlocksController::block_assets' );
186	183
187	184	add_action( 'admin_init', 'FrmUsageController::schedule_send' );
188	185
189	186	// Applications Controller.
		@@ -199,24 +196,16 @@
199	196
200	197	// Cronjob.
201	198	add_action( 'admin_init', 'FrmCronController::schedule_events' );
202	199
203		- // Cross sell.
204		- add_action( 'admin_menu', 'FrmSalesApi::menu', 1000 );
205		-
206	200	// Deactivation feedback.
207	201	add_action( 'admin_enqueue_scripts', 'FrmDeactivationFeedbackController::enqueue_assets' );
208	202	add_action( 'admin_footer', 'FrmDeactivationFeedbackController::footer_html' );
209	203	add_action( 'deactivated_plugin', 'FrmDeactivationFeedbackController::set_feedback_expired_date' );
210	204
211		- add_action( 'frm_email_styles_extra_settings', 'FrmEmailStylesController::show_upsell_settings' );
212		-
213		- add_action( 'admin_init', 'FrmWelcomeTourController::admin_init' );
214		-
215	205	FrmDashboardController::load_admin_hooks();
216	206	FrmTransLiteHooksController::load_admin_hooks();
217	207	FrmStrpLiteHooksController::load_admin_hooks();
218		- FrmSquareLiteHooksController::load_admin_hooks();
219	208	FrmSMTPController::load_hooks();
220	209	FrmOnboardingWizardController::load_admin_hooks();
221	210	FrmAddonsController::load_admin_hooks();
222	211	new FrmPluginSearch();
		@@ -272,9 +261,8 @@
272	261
273	262	// Form Templates Controller.
274	263	add_action( 'wp_ajax_frm_add_or_remove_favorite_template', 'FrmFormTemplatesController::ajax_add_or_remove_favorite' );
275	264	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	265
278	266	// Inbox.
279	267	add_action( 'wp_ajax_frm_inbox_dismiss', 'FrmInboxController::dismiss_message' );
280	268
		@@ -312,17 +300,8 @@
312	300	add_action( 'wp_ajax_frm_get_applications_data', 'FrmApplicationsController::get_applications_data' );
313	301
314	302	// Reviews.
315	303	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	304	}
326	305
327	306	/**
328	307	* @return void