← All changes | classes/controllers/FrmInboxController.php +11 -19 6.25 → trunk View file →

		@@ -14,8 +14,9 @@
14	14	* @since 4.05
15	15	* @since 6.8.4 The $filtered parameter was added.
16	16	*
17	17	* @param bool $filtered Set this to false to avoid the frm_inbox_badge filter.
	18	+ *
18	19	* @return string
19	20	*/
20	21	public static function get_notice_count( $filtered = true ) {
21	22	FrmFormMigratorsHelper::maybe_add_to_inbox();
		@@ -56,9 +57,10 @@
56	57	check_ajax_referer( 'frm_ajax', 'nonce' );
57	58	FrmAppHelper::permission_check( 'frm_view_forms' );
58	59
59	60	$key = FrmAppHelper::get_param( 'key', '', 'post', 'sanitize_text_field' );
60		- if ( ! empty( $key ) ) {
	61	+
	62	+ if ( $key ) {
61	63	$message = new FrmInbox();
62	64	$message->dismiss( $key );
63	65
64	66	if ( $key === 'review' ) {
		@@ -80,22 +82,20 @@
80	82	*
81	83	* @return void
82	84	*/
83	85	private static function add_tracking_request() {
84		- $settings = FrmAppHelper::get_settings();
85		- if ( $settings->tracking ) {
	86	+ if ( FrmAppHelper::get_settings()->tracking ) {
86	87	return;
87	88	}
88	89
89		- $link = admin_url( 'admin.php?page=formidable-settings&t=misc_settings' );
90		-
	90	+ $link = admin_url( 'admin.php?page=formidable-settings&t=misc_settings' );
91	91	$message = new FrmInbox();
92	92	$message->add_message(
93	93	array(
94	94	'key' => 'usage',
95		- 'message' => 'Gathering usage data allows us to improve Formidable. Your forms will be considered as we evaluate new features, judge the quality of an update, or determine if an improvement makes sense. You can always visit the <a href="' . esc_url( $link ) . '">Global Settings</a> and choose to stop sharing data. <a href="https://formidableforms.com/knowledgebase/global-settings-overview/#kb-usage-tracking" target="_blank" rel="noopener noreferrer">Read more about what data we collect</a>.',
	95	+ 'message' => 'Gathering usage data allows us to improve Formidable. Your forms will be considered as we evaluate new features, judge the quality of an update, or determine if an improvement makes sense. You can always visit the <a href="' . esc_url( $link ) . '">Global Settings</a> and choose to stop sharing data. <a href="https://formidableforms.com/knowledgebase/global-settings-overview/#kb-usage-tracking" target="_blank" rel="noopener noreferrer">Read more about what data we collect</a>.', // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
96	96	'subject' => __( 'Help Formidable improve with usage tracking', 'formidable' ),
97		- 'cta' => '<a href="#" class="frm-button-secondary frm_inbox_dismiss">Dismiss</a> <a href="' . esc_url( $link ) . '" class="button-primary frm-button-primary frm_inbox_dismiss">Activate usage tracking</a>',
	97	+ 'cta' => '<a href="#" class="frm-button-secondary frm_inbox_dismiss">Dismiss</a> <a href="' . esc_url( $link ) . '" class="button-primary frm-button-primary frm_inbox_dismiss">Activate usage tracking</a>', // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
98	98	'type' => 'feedback',
99	99	)
100	100	);
101	101	}
		@@ -107,20 +107,12 @@
107	107	*
108	108	* @return void
109	109	*/
110	110	private static function remove_free_template_message() {
111		- if ( ! FrmAppHelper::pro_is_installed() ) {
112		- $message = new FrmInbox();
113		- $message->dismiss( 'free_templates' );
	111	+ if ( FrmAppHelper::pro_is_installed() ) {
	112	+ return;
114	113	}
115		- }
116	114
117		- /**
118		- * @since 4.06
119		- * @deprecated 6.16
120		- *
121		- * @return void
122		- */
123		- public static function dismiss_all_button( $atts ) {
124		- _deprecated_function( __METHOD__, '6.16' );
	115	+ $message = new FrmInbox();
	116	+ $message->dismiss( 'free_templates' );
125	117	}
126	118	}