← All changes | classes/controllers/FrmInboxController.php +58 -45 6.34 → 5.4 View file →

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