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