← All changes | classes/controllers/FrmInboxController.php +61 -38 6.35 → 6.7 View file →

		@@ -8,45 +8,58 @@
8	8	*/
9	9	class FrmInboxController {
10	10
11	11	/**
12		- * Get the HTML for the inbox notice.
	12	+ * @since 4.05
13	13	*
	14	+ * @return void
	15	+ */
	16	+ public static function menu() {
	17	+ $unread = self::get_notice_count();
	18	+ add_submenu_page( 'formidable', 'Formidable | ' . __( 'Inbox', 'formidable' ), __( 'Inbox', 'formidable' ) . $unread, 'frm_change_settings', 'formidable-inbox', 'FrmInboxController::inbox' );
	19	+ }
	20	+
	21	+ /**
14	22	* @since 4.05
15		- * @since 6.8.4 The $filtered parameter was added.
16		- *
17		- * @param bool $filtered Set this to false to avoid the frm_inbox_badge filter.
18		- *
19		- * @return string
20	23	*/
21		- public static function get_notice_count( $filtered = true ) {
	24	+ private static function get_notice_count() {
22	25	FrmFormMigratorsHelper::maybe_add_to_inbox();
23	26
24	27	$inbox = new FrmInbox();
25		- return $inbox->unread_html( $filtered );
	28	+ return $inbox->unread_html();
26	29	}
27	30
28	31	/**
29		- * @since 6.8
	32	+ * @since 4.06
30	33	*
31		- * @return array
	34	+ * @return void
32	35	*/
33		- public static function get_inbox_messages() {
	36	+ public static function dismiss_all_button( $atts ) {
	37	+ if ( empty( $atts['messages'] ) ) {
	38	+ return;
	39	+ }
	40	+
	41	+ echo '<button class="frm-button-secondary" id="frm-dismiss-inbox" type="button">' .
	42	+ esc_html__( 'Dismiss All', 'formidable' ) .
	43	+ '</button>';
	44	+ }
	45	+
	46	+ /**
	47	+ * @since 4.05
	48	+ *
	49	+ * @return void
	50	+ */
	51	+ public static function inbox() {
	52	+ FrmAppHelper::include_svg();
34	53	self::add_tracking_request();
35		- self::remove_free_template_message();
	54	+ self::add_free_template_message();
36	55
37		- $inbox = new FrmInbox();
38		- $unread_messages = $inbox->get_messages();
39		- $dismissed_messages = $unread_messages;
	56	+ $inbox = new FrmInbox();
	57	+ $messages = $inbox->get_messages( 'filter' );
	58	+ $messages = array_reverse( $messages );
	59	+ $user = wp_get_current_user();
40	60
41		- $inbox->filter_messages( $unread_messages, 'filter' );
42		- $inbox->filter_messages( $dismissed_messages, 'dismissed' );
43		-
44		- return array(
45		- 'unread' => array_reverse( $unread_messages ),
46		- 'dismissed' => array_reverse( $dismissed_messages ),
47		- 'user' => wp_get_current_user(),
48		- );
	61	+ include( FrmAppHelper::plugin_path() . '/classes/views/inbox/list.php' );
49	62	}
50	63
51	64	/**
52	65	* @since 4.05
		@@ -54,25 +67,18 @@
54	67	* @return void
55	68	*/
56	69	public static function dismiss_message() {
57	70	check_ajax_referer( 'frm_ajax', 'nonce' );
58		- FrmAppHelper::permission_check( 'frm_view_forms' );
	71	+ FrmAppHelper::permission_check( 'frm_change_settings' );
59	72
60	73	$key = FrmAppHelper::get_param( 'key', '', 'post', 'sanitize_text_field' );
61		-
62		- if ( $key ) {
	74	+ if ( ! empty( $key ) ) {
63	75	$message = new FrmInbox();
64	76	$message->dismiss( $key );
65		-
66	77	if ( $key === 'review' ) {
67	78	$reviews = new FrmReviews();
68	79	$reviews->dismiss_review();
69	80	}
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	81	}
76	82
77	83	wp_die();
78	84	}
		@@ -82,20 +88,22 @@
82	88	*
83	89	* @return void
84	90	*/
85	91	private static function add_tracking_request() {
86		- if ( FrmAppHelper::get_settings()->tracking ) {
	92	+ $settings = FrmAppHelper::get_settings();
	93	+ if ( $settings->tracking ) {
87	94	return;
88	95	}
89	96
90		- $link = admin_url( 'admin.php?page=formidable-settings&t=misc_settings' );
	97	+ $link = admin_url( 'admin.php?page=formidable-settings&t=misc_settings' );
	98	+
91	99	$message = new FrmInbox();
92	100	$message->add_message(
93	101	array(
94	102	'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>.', // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
	103	+ '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>.',
96	104	'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>', // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
	105	+ '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>',
98	106	'type' => 'feedback',
99	107	)
100	108	);
101	109	}
		@@ -106,13 +114,28 @@
106	114	* @since 4.10.03
107	115	*
108	116	* @return void
109	117	*/
110		- private static function remove_free_template_message() {
	118	+ private static function add_free_template_message() {
111	119	if ( FrmAppHelper::pro_is_installed() ) {
112	120	return;
113	121	}
114	122
	123	+ $api = new FrmFormTemplateApi();
	124	+ if ( $api->has_free_access() ) {
	125	+ return;
	126	+ }
	127	+
	128	+ $link = admin_url( 'admin.php?page=' . FrmFormTemplatesController::PAGE_SLUG . '&free-templates=1' );
	129	+
115	130	$message = new FrmInbox();
116		- $message->dismiss( 'free_templates' );
	131	+ $message->add_message(
	132	+ array(
	133	+ 'key' => 'free_templates',
	134	+ 'message' => 'Add your email address to get a code for 20+ free form templates.',
	135	+ 'subject' => 'Get 20+ Free Form Templates',
	136	+ '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>',
	137	+ 'type' => 'feedback',
	138	+ )
	139	+ );
117	140	}
118	141	}