← All changes | classes/controllers/FrmInboxController.php +33 -15 6.26 → 6.16 View file →

		@@ -14,9 +14,8 @@
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		- *
19	18	* @return string
20	19	*/
21	20	public static function get_notice_count( $filtered = true ) {
22	21	FrmFormMigratorsHelper::maybe_add_to_inbox();
		@@ -31,9 +30,9 @@
31	30	* @return array
32	31	*/
33	32	public static function get_inbox_messages() {
34	33	self::add_tracking_request();
35		- self::remove_free_template_message();
	34	+ self::add_free_template_message();
36	35
37	36	$inbox = new FrmInbox();
38	37	$unread_messages = $inbox->get_messages();
39	38	$dismissed_messages = $unread_messages;
		@@ -54,25 +53,18 @@
54	53	* @return void
55	54	*/
56	55	public static function dismiss_message() {
57	56	check_ajax_referer( 'frm_ajax', 'nonce' );
58		- FrmAppHelper::permission_check( 'frm_view_forms' );
	57	+ FrmAppHelper::permission_check( 'frm_change_settings' );
59	58
60	59	$key = FrmAppHelper::get_param( 'key', '', 'post', 'sanitize_text_field' );
61		-
62	60	if ( ! empty( $key ) ) {
63	61	$message = new FrmInbox();
64	62	$message->dismiss( $key );
65		-
66	63	if ( $key === 'review' ) {
67	64	$reviews = new FrmReviews();
68	65	$reviews->dismiss_review();
69	66	}
70		-
71		- if ( $key === 'onboarding_wizard' ) {
72		- // Delete the skipped option or the inbox message will continue to get added.
73		- delete_option( FrmOnboardingWizardController::ONBOARDING_SKIPPED_OPTION );
74		- }
75	67	}
76	68
77	69	wp_die();
78	70	}
		@@ -83,9 +75,8 @@
83	75	* @return void
84	76	*/
85	77	private static function add_tracking_request() {
86	78	$settings = FrmAppHelper::get_settings();
87		-
88	79	if ( $settings->tracking ) {
89	80	return;
90	81	}
91	82
		@@ -109,11 +100,38 @@
109	100	* @since 4.10.03
110	101	*
111	102	* @return void
112	103	*/
113		- private static function remove_free_template_message() {
114		- if ( ! FrmAppHelper::pro_is_installed() ) {
115		- $message = new FrmInbox();
116		- $message->dismiss( 'free_templates' );
	104	+ private static function add_free_template_message() {
	105	+ if ( FrmAppHelper::pro_is_installed() ) {
	106	+ return;
117	107	}
	108	+
	109	+ $api = new FrmFormTemplateApi();
	110	+ if ( $api->has_free_access() ) {
	111	+ return;
	112	+ }
	113	+
	114	+ $link = admin_url( 'admin.php?page=' . FrmFormTemplatesController::PAGE_SLUG . '&free-templates=1' );
	115	+
	116	+ $message = new FrmInbox();
	117	+ $message->add_message(
	118	+ array(
	119	+ 'key' => 'free_templates',
	120	+ 'message' => 'Add your email address to get a code for 20+ free form templates.',
	121	+ 'subject' => 'Get 20+ Free Form Templates',
	122	+ 'cta' => '<a href="#" class="frm-button-secondary frm_inbox_dismiss">Dismiss</a> <a href="' . esc_url( $link ) . '" class="button-primary frm-button-primary">Get Now</a>',
	123	+ 'type' => 'feedback',
	124	+ )
	125	+ );
	126	+ }
	127	+
	128	+ /**
	129	+ * @since 4.06
	130	+ * @deprecated 6.16
	131	+ *
	132	+ * @return void
	133	+ */
	134	+ public static function dismiss_all_button( $atts ) {
	135	+ _deprecated_function( __METHOD__, '6.16' );
118	136	}
119	137	}