← All changes | classes/controllers/FrmHooksController.php +6 -25 6.31 → 6.22 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	}
		@@ -114,9 +114,8 @@
114	114
115	115	FrmTransLiteHooksController::load_hooks();
116	116	FrmStrpLiteHooksController::load_hooks();
117	117	FrmSquareLiteHooksController::load_hooks();
118		- FrmPayPalLiteHooksController::load_hooks();
119	118
120	119	// GDPR
121	120	add_filter( 'frm_is_field_required', 'FrmFieldGdpr::force_required_field', 10, 2 );
122	121	}
		@@ -147,16 +146,13 @@
147	146	}
148	147
149	148	add_action( 'frm_after_duplicate_form', 'FrmFormActionsController::duplicate_form_actions', 20, 3 );
150	149
151		- // Fields Model.
152		- add_filter( 'frm_pro_available_fields', 'FrmField::show_update_for_pro_fields' );
153		-
154	150	// Forms Controller.
155	151	add_action( 'admin_menu', 'FrmFormsController::menu', 10 );
156	152	add_action( 'admin_head-toplevel_page_formidable', 'FrmFormsController::head' );
157	153	add_action( 'frm_after_field_options', 'FrmFormsController::logic_tip' );
158		- 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 );
159	155
160	156	add_filter( 'set-screen-option', 'FrmFormsController::save_per_page', 10, 3 );
161	157	add_action( 'admin_footer', 'FrmFormsController::insert_form_popup' );
162	158
		@@ -185,9 +181,8 @@
185	181	add_action( 'admin_menu', 'FrmXMLController::menu', 41 );
186	182
187	183	// Simple Blocks Controller.
188	184	add_action( 'enqueue_block_editor_assets', 'FrmSimpleBlocksController::block_editor_assets' );
189		- add_action( 'enqueue_block_assets', 'FrmSimpleBlocksController::block_assets' );
190	185
191	186	add_action( 'admin_init', 'FrmUsageController::schedule_send' );
192	187
193	188	// Applications Controller.
		@@ -203,25 +198,17 @@
203	198
204	199	// Cronjob.
205	200	add_action( 'admin_init', 'FrmCronController::schedule_events' );
206	201
207		- // Cross sell.
208		- add_action( 'admin_menu', 'FrmSalesApi::menu', 1000 );
209		-
210	202	// Deactivation feedback.
211	203	add_action( 'admin_enqueue_scripts', 'FrmDeactivationFeedbackController::enqueue_assets' );
212	204	add_action( 'admin_footer', 'FrmDeactivationFeedbackController::footer_html' );
213	205	add_action( 'deactivated_plugin', 'FrmDeactivationFeedbackController::set_feedback_expired_date' );
214	206
215		- add_action( 'frm_email_styles_extra_settings', 'FrmEmailStylesController::show_upsell_settings' );
216		-
217		- add_action( 'admin_init', 'FrmWelcomeTourController::admin_init' );
218		-
219	207	FrmDashboardController::load_admin_hooks();
220	208	FrmTransLiteHooksController::load_admin_hooks();
221	209	FrmStrpLiteHooksController::load_admin_hooks();
222	210	FrmSquareLiteHooksController::load_admin_hooks();
223		- FrmPayPalLiteHooksController::load_admin_hooks();
224	211	FrmSMTPController::load_hooks();
225	212	FrmOnboardingWizardController::load_admin_hooks();
226	213	FrmAddonsController::load_admin_hooks();
227	214	new FrmPluginSearch();
		@@ -277,9 +264,8 @@
277	264
278	265	// Form Templates Controller.
279	266	add_action( 'wp_ajax_frm_add_or_remove_favorite_template', 'FrmFormTemplatesController::ajax_add_or_remove_favorite' );
280	267	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	268
283	269	// Inbox.
284	270	add_action( 'wp_ajax_frm_inbox_dismiss', 'FrmInboxController::dismiss_message' );
285	271
		@@ -317,17 +303,12 @@
317	303	add_action( 'wp_ajax_frm_get_applications_data', 'FrmApplicationsController::get_applications_data' );
318	304
319	305	// Reviews.
320	306	add_action( 'wp_ajax_frm_dismiss_review', 'FrmAppController::dismiss_review' );
	307	+
321	308	add_action( 'wp_ajax_frm_small_screen_proceed', 'FrmAppController::small_screen_proceed' );
	309	+
322	310	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	311	}
331	312
332	313	/**
333	314	* @return void