← All changes | classes/controllers/FrmInboxController.php +44 -23 6.5.2 → 6.13 View file →

		@@ -8,25 +8,21 @@
8	8	*/
9	9	class FrmInboxController {
10	10
11	11	/**
	12	+ * Get the HTML for the inbox notice.
	13	+ *
12	14	* @since 4.05
	15	+ * @since 6.8.4 The $filtered parameter was added.
13	16	*
14		- * @return void
	17	+ * @param bool $filtered Set this to false to avoid the frm_inbox_badge filter.
	18	+ * @return string
15	19	*/
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		- /**
22		- * @since 4.05
23		- */
24		- private static function get_notice_count() {
	20	+ public static function get_notice_count( $filtered = true ) {
25	21	FrmFormMigratorsHelper::maybe_add_to_inbox();
26	22
27	23	$inbox = new FrmInbox();
28		- return $inbox->unread_html();
	24	+ return $inbox->unread_html( $filtered );
29	25	}
30	26
31	27	/**
32	28	* @since 4.06
		@@ -43,23 +39,28 @@
43	39	'</button>';
44	40	}
45	41
46	42	/**
47		- * @since 4.05
	43	+ * @since 6.8
48	44	*
49		- * @return void
	45	+ * @return array
50	46	*/
51		- public static function inbox() {
52		- FrmAppHelper::include_svg();
	47	+ public static function get_inbox_messages() {
53	48	self::add_tracking_request();
54	49	self::add_free_template_message();
55	50
56		- $inbox = new FrmInbox();
57		- $messages = $inbox->get_messages( 'filter' );
58		- $messages = array_reverse( $messages );
59		- $user = wp_get_current_user();
	51	+ $inbox = new FrmInbox();
	52	+ $unread_messages = $inbox->get_messages();
	53	+ $dismissed_messages = $unread_messages;
60	54
61		- include( FrmAppHelper::plugin_path() . '/classes/views/inbox/list.php' );
	55	+ $inbox->filter_messages( $unread_messages, 'filter' );
	56	+ $inbox->filter_messages( $dismissed_messages, 'dismissed' );
	57	+
	58	+ return array(
	59	+ 'unread' => array_reverse( $unread_messages ),
	60	+ 'dismissed' => array_reverse( $dismissed_messages ),
	61	+ 'user' => wp_get_current_user(),
	62	+ );
62	63	}
63	64
64	65	/**
65	66	* @since 4.05
		@@ -124,18 +125,38 @@
124	125	if ( $api->has_free_access() ) {
125	126	return;
126	127	}
127	128
128		- $link = admin_url( 'admin.php?page=formidable&triggerNewFormModal=1&free-templates=1' );
	129	+ $link = admin_url( 'admin.php?page=' . FrmFormTemplatesController::PAGE_SLUG . '&free-templates=1' );
129	130
130	131	$message = new FrmInbox();
131	132	$message->add_message(
132	133	array(
133	134	'key' => 'free_templates',
134		- 'message' => 'Add your email address to get a code for 10+ free form templates.',
135		- 'subject' => 'Get 10+ Free Form Templates',
	135	+ 'message' => 'Add your email address to get a code for 20+ free form templates.',
	136	+ 'subject' => 'Get 20+ Free Form Templates',
136	137	'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	138	'type' => 'feedback',
138	139	)
139	140	);
	141	+ }
	142	+
	143	+ /**
	144	+ * @since 4.05
	145	+ * @deprecated 6.8
	146	+ *
	147	+ * @return void
	148	+ */
	149	+ public static function menu() {
	150	+ _deprecated_function( __METHOD__, '6.8' );
	151	+ }
	152	+
	153	+ /**
	154	+ * @since 4.05
	155	+ * @deprecated 6.8
	156	+ *
	157	+ * @return void
	158	+ */
	159	+ public static function inbox() {
	160	+ _deprecated_function( __METHOD__, '6.8' );
140	161	}
141	162	}