← All changes | classes/controllers/FrmHooksController.php +4 -34 6.32 → 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,15 +80,11 @@
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		- // Clear embed posts transient when posts are updated.
89		- add_action( 'wp_insert_post', 'FrmFormsListHelper::maybe_clear_embed_posts_transient', 10, 2 );
90		-
91	87	// Form Shortcodes.
92	88	add_shortcode( 'formidable', 'FrmFormsController::get_form_shortcode' );
93	89
94	90	// Styles Controller.
		@@ -116,10 +112,8 @@
116	112	add_action( 'frm_daily_event', 'FrmEmailSummaryController::maybe_send_emails' );
117	113
118	114	FrmTransLiteHooksController::load_hooks();
119	115	FrmStrpLiteHooksController::load_hooks();
120		- FrmSquareLiteHooksController::load_hooks();
121		- FrmPayPalLiteHooksController::load_hooks();
122	116
123	117	// GDPR
124	118	add_filter( 'frm_is_field_required', 'FrmFieldGdpr::force_required_field', 10, 2 );
125	119	}
		@@ -150,20 +144,16 @@
150	144	}
151	145
152	146	add_action( 'frm_after_duplicate_form', 'FrmFormActionsController::duplicate_form_actions', 20, 3 );
153	147
154		- // Fields Model.
155		- add_filter( 'frm_pro_available_fields', 'FrmField::show_update_for_pro_fields' );
156		-
157	148	// Forms Controller.
158	149	add_action( 'admin_menu', 'FrmFormsController::menu', 10 );
159	150	add_action( 'admin_head-toplevel_page_formidable', 'FrmFormsController::head' );
160	151	add_action( 'frm_after_field_options', 'FrmFormsController::logic_tip' );
161		- 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 );
162	153
163	154	add_filter( 'set-screen-option', 'FrmFormsController::save_per_page', 10, 3 );
164	155	add_action( 'admin_footer', 'FrmFormsController::insert_form_popup' );
165		- add_action( 'admin_footer', 'FrmFormsController::print_forms_list_templates' );
166	156
167	157	// Elementor.
168	158	add_action( 'elementor/editor/footer', 'FrmElementorController::admin_init' );
169	159
		@@ -189,9 +179,8 @@
189	179	add_action( 'admin_menu', 'FrmXMLController::menu', 41 );
190	180
191	181	// Simple Blocks Controller.
192	182	add_action( 'enqueue_block_editor_assets', 'FrmSimpleBlocksController::block_editor_assets' );
193		- add_action( 'enqueue_block_assets', 'FrmSimpleBlocksController::block_assets' );
194	183
195	184	add_action( 'admin_init', 'FrmUsageController::schedule_send' );
196	185
197	186	// Applications Controller.
		@@ -207,25 +196,16 @@
207	196
208	197	// Cronjob.
209	198	add_action( 'admin_init', 'FrmCronController::schedule_events' );
210	199
211		- // Cross sell.
212		- add_action( 'admin_menu', 'FrmSalesApi::menu', 1000 );
213		-
214	200	// Deactivation feedback.
215	201	add_action( 'admin_enqueue_scripts', 'FrmDeactivationFeedbackController::enqueue_assets' );
216	202	add_action( 'admin_footer', 'FrmDeactivationFeedbackController::footer_html' );
217	203	add_action( 'deactivated_plugin', 'FrmDeactivationFeedbackController::set_feedback_expired_date' );
218	204
219		- add_action( 'frm_email_styles_extra_settings', 'FrmEmailStylesController::show_upsell_settings' );
220		-
221		- add_action( 'admin_init', 'FrmWelcomeTourController::admin_init' );
222		-
223	205	FrmDashboardController::load_admin_hooks();
224	206	FrmTransLiteHooksController::load_admin_hooks();
225	207	FrmStrpLiteHooksController::load_admin_hooks();
226		- FrmSquareLiteHooksController::load_admin_hooks();
227		- FrmPayPalLiteHooksController::load_admin_hooks();
228	208	FrmSMTPController::load_hooks();
229	209	FrmOnboardingWizardController::load_admin_hooks();
230	210	FrmAddonsController::load_admin_hooks();
231	211	new FrmPluginSearch();
		@@ -281,9 +261,8 @@
281	261
282	262	// Form Templates Controller.
283	263	add_action( 'wp_ajax_frm_add_or_remove_favorite_template', 'FrmFormTemplatesController::ajax_add_or_remove_favorite' );
284	264	add_action( 'wp_ajax_frm_create_template', 'FrmFormTemplatesController::ajax_create_template' );
285		- add_action( 'wp_ajax_frm_get_free_templates', 'FrmFormTemplatesController::ajax_get_free_templates' );
286	265
287	266	// Inbox.
288	267	add_action( 'wp_ajax_frm_inbox_dismiss', 'FrmInboxController::dismiss_message' );
289	268
		@@ -321,17 +300,8 @@
321	300	add_action( 'wp_ajax_frm_get_applications_data', 'FrmApplicationsController::get_applications_data' );
322	301
323	302	// Reviews.
324	303	add_action( 'wp_ajax_frm_dismiss_review', 'FrmAppController::dismiss_review' );
325		- add_action( 'wp_ajax_frm_small_screen_proceed', 'FrmAppController::small_screen_proceed' );
326		- add_action( 'wp_ajax_frm_sale_banner_dismiss', 'FrmSalesApi::dismiss_banner' );
327		-
328		- add_action( 'wp_ajax_frm_email_style_preview', 'FrmEmailStylesController::ajax_preview' );
329		- add_action( 'wp_ajax_frm_send_test_email', 'FrmEmailStylesController::ajax_send_test_email' );
330		-
331		- // Welcome Tour.
332		- add_action( 'wp_ajax_frm_mark_checklist_step_as_completed', 'FrmWelcomeTourController::ajax_mark_checklist_step_as_completed' );
333		- add_action( 'wp_ajax_frm_dismiss_welcome_tour', 'FrmWelcomeTourController::ajax_dismiss_welcome_tour' );
334	304	}
335	305
336	306	/**
337	307	* @return void