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

		@@ -58,9 +58,9 @@
58	58	FrmAppHelper::permission_check( 'frm_view_forms' );
59	59
60	60	$key = FrmAppHelper::get_param( 'key', '', 'post', 'sanitize_text_field' );
61	61
62		- if ( ! empty( $key ) ) {
	62	+ if ( $key ) {
63	63	$message = new FrmInbox();
64	64	$message->dismiss( $key );
65	65
66	66	if ( $key === 'review' ) {
		@@ -82,23 +82,20 @@
82	82	*
83	83	* @return void
84	84	*/
85	85	private static function add_tracking_request() {
86		- $settings = FrmAppHelper::get_settings();
87		-
88		- if ( $settings->tracking ) {
	86	+ if ( FrmAppHelper::get_settings()->tracking ) {
89	87	return;
90	88	}
91	89
92		- $link = admin_url( 'admin.php?page=formidable-settings&t=misc_settings' );
93		-
	90	+ $link = admin_url( 'admin.php?page=formidable-settings&t=misc_settings' );
94	91	$message = new FrmInbox();
95	92	$message->add_message(
96	93	array(
97	94	'key' => 'usage',
98		- '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
99	96	'subject' => __( 'Help Formidable improve with usage tracking', 'formidable' ),
100		- '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
101	98	'type' => 'feedback',
102	99	)
103	100	);
104	101	}
		@@ -110,10 +107,12 @@
110	107	*
111	108	* @return void
112	109	*/
113	110	private static function remove_free_template_message() {
114		- if ( ! FrmAppHelper::pro_is_installed() ) {
115		- $message = new FrmInbox();
116		- $message->dismiss( 'free_templates' );
	111	+ if ( FrmAppHelper::pro_is_installed() ) {
	112	+ return;
117	113	}
	114	+
	115	+ $message = new FrmInbox();
	116	+ $message->dismiss( 'free_templates' );
118	117	}
119	118	}