← All changes | classes/controllers/FrmHooksController.php +6 -23 6.29 → 6.23 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	}
		@@ -146,16 +146,13 @@
146	146	}
147	147
148	148	add_action( 'frm_after_duplicate_form', 'FrmFormActionsController::duplicate_form_actions', 20, 3 );
149	149
150		- // Fields Model.
151		- add_filter( 'frm_pro_available_fields', 'FrmField::show_update_for_pro_fields' );
152		-
153	150	// Forms Controller.
154	151	add_action( 'admin_menu', 'FrmFormsController::menu', 10 );
155	152	add_action( 'admin_head-toplevel_page_formidable', 'FrmFormsController::head' );
156	153	add_action( 'frm_after_field_options', 'FrmFormsController::logic_tip' );
157		- add_filter( 'frm_fields_in_form_builder', 'FrmFormsController::update_form_builder_fields' );
	154	+ add_filter( 'frm_fields_in_form_builder', 'FrmFormsController::update_form_builder_fields', 10, 2 );
158	155
159	156	add_filter( 'set-screen-option', 'FrmFormsController::save_per_page', 10, 3 );
160	157	add_action( 'admin_footer', 'FrmFormsController::insert_form_popup' );
161	158
		@@ -184,9 +181,8 @@
184	181	add_action( 'admin_menu', 'FrmXMLController::menu', 41 );
185	182
186	183	// Simple Blocks Controller.
187	184	add_action( 'enqueue_block_editor_assets', 'FrmSimpleBlocksController::block_editor_assets' );
188		- add_action( 'enqueue_block_assets', 'FrmSimpleBlocksController::block_assets' );
189	185
190	186	add_action( 'admin_init', 'FrmUsageController::schedule_send' );
191	187
192	188	// Applications Controller.
		@@ -202,20 +198,13 @@
202	198
203	199	// Cronjob.
204	200	add_action( 'admin_init', 'FrmCronController::schedule_events' );
205	201
206		- // Cross sell.
207		- add_action( 'admin_menu', 'FrmSalesApi::menu', 1000 );
208		-
209	202	// Deactivation feedback.
210	203	add_action( 'admin_enqueue_scripts', 'FrmDeactivationFeedbackController::enqueue_assets' );
211	204	add_action( 'admin_footer', 'FrmDeactivationFeedbackController::footer_html' );
212	205	add_action( 'deactivated_plugin', 'FrmDeactivationFeedbackController::set_feedback_expired_date' );
213	206
214		- add_action( 'frm_email_styles_extra_settings', 'FrmEmailStylesController::show_upsell_settings' );
215		-
216		- add_action( 'admin_init', 'FrmWelcomeTourController::admin_init' );
217		-
218	207	FrmDashboardController::load_admin_hooks();
219	208	FrmTransLiteHooksController::load_admin_hooks();
220	209	FrmStrpLiteHooksController::load_admin_hooks();
221	210	FrmSquareLiteHooksController::load_admin_hooks();
		@@ -275,9 +264,8 @@
275	264
276	265	// Form Templates Controller.
277	266	add_action( 'wp_ajax_frm_add_or_remove_favorite_template', 'FrmFormTemplatesController::ajax_add_or_remove_favorite' );
278	267	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	268
281	269	// Inbox.
282	270	add_action( 'wp_ajax_frm_inbox_dismiss', 'FrmInboxController::dismiss_message' );
283	271
		@@ -315,17 +303,12 @@
315	303	add_action( 'wp_ajax_frm_get_applications_data', 'FrmApplicationsController::get_applications_data' );
316	304
317	305	// Reviews.
318	306	add_action( 'wp_ajax_frm_dismiss_review', 'FrmAppController::dismiss_review' );
	307	+
319	308	add_action( 'wp_ajax_frm_small_screen_proceed', 'FrmAppController::small_screen_proceed' );
	309	+
320	310	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	311	}
329	312
330	313	/**
331	314	* @return void