← All changes | classes/models/FrmReviews.php +7 -48 6.26.1 → 5.2.07 View file →

		@@ -4,21 +4,12 @@
4	4	}
5	5
6	6	class FrmReviews {
7	7
8		- /**
9		- * @var string
10		- */
11	8	private $option_name = 'frm_reviewed';
12	9
13		- /**
14		- * @var array
15		- */
16	10	private $review_status = array();
17	11
18		- /**
19		- * @var string
20		- */
21	12	private $inbox_key = 'review';
22	13
23	14	/**
24	15	* Add admin notices as needed for reviews
		@@ -23,10 +14,8 @@
23	14	/**
24	15	* Add admin notices as needed for reviews
25	16	*
26	17	* @since 3.04.03
27		- *
28		- * @return void
29	18	*/
30	19	public function review_request() {
31	20
32	21	// Only show the review request to high-level users on Formidable pages
		@@ -38,14 +27,13 @@
38	27	$this->set_review_status();
39	28
40	29	// Check if it has been dismissed or if we can ask later
41	30	$dismissed = $this->review_status['dismissed'];
42		-
43	31	if ( $dismissed === 'later' && $this->review_status['asked'] < 3 ) {
44	32	$dismissed = false;
45	33	}
46	34
47		- $week_ago = $this->review_status['time'] + WEEK_IN_SECONDS <= time();
	35	+ $week_ago = ( $this->review_status['time'] + WEEK_IN_SECONDS ) <= time();
48	36
49	37	if ( empty( $dismissed ) && $week_ago ) {
50	38	$this->review();
51	39	}
		@@ -54,10 +42,8 @@
54	42	/**
55	43	* When was the review request last dismissed?
56	44	*
57	45	* @since 3.04.03
58		- *
59		- * @return void
60	46	*/
61	47	private function set_review_status() {
62	48	$user_id = get_current_user_id();
63	49	$review = get_user_meta( $user_id, $this->option_name, true );
		@@ -80,10 +66,8 @@
80	66	/**
81	67	* Maybe show review request
82	68	*
83	69	* @since 3.04.03
84		- *
85		- * @return void
86	70	*/
87	71	private function review() {
88	72
89	73	// show the review request 3 times, depending on the number of entries
		@@ -113,18 +97,17 @@
113	97	} else {
114	98	// round to the nearest 50
115	99	$entries = floor( $entries / 50 ) * 50;
116	100	}
117		-
118	101	$name = $user->first_name;
119		-
120	102	if ( ! empty( $name ) ) {
121	103	$name = ' ' . $name;
122	104	}
123	105
124	106	$title = sprintf(
125		- /* translators: %1$d: number of entries */
126		- esc_html__( 'You have collected %1$d form submissions.', 'formidable' ),
	107	+ /* translators: %s: User name, %2$d: number of entries */
	108	+ esc_html__( 'Congratulations%1$s! You have collected %2$d form submissions.', 'formidable' ),
	109	+ esc_html( $name ),
127	110	absint( $entries )
128	111	);
129	112
130	113	$this->add_to_inbox( $title, $name, $asked );
		@@ -129,20 +112,13 @@
129	112
130	113	$this->add_to_inbox( $title, $name, $asked );
131	114
132	115	// We have a candidate! Output a review message.
133		- include FrmAppHelper::plugin_path() . '/classes/views/shared/review.php';
	116	+ include( FrmAppHelper::plugin_path() . '/classes/views/shared/review.php' );
134	117	}
135	118
136		- /**
137		- * @param string $title
138		- * @param string $name
139		- * @param int $asked
140		- *
141		- * @return void
142		- */
143	119	private function add_to_inbox( $title, $name, $asked ) {
144		- $message = new FrmInbox();
	120	+ $message = new FrmInbox();
145	121	$requests = $message->get_messages();
146	122	$key = $this->inbox_key . ( $asked ? $asked : '' );
147	123
148	124	if ( isset( $requests[ $key ] ) ) {
		@@ -152,9 +128,8 @@
152	128	// Remove previous requests.
153	129	if ( $asked > 0 ) {
154	130	$message->remove( $this->inbox_key );
155	131	}
156		-
157	132	if ( $asked > 1 ) {
158	133	$message->remove( $this->inbox_key . '1' );
159	134	}
160	135
		@@ -169,9 +144,9 @@
169	144	'message' => __( 'If you are enjoying Formidable, could you do me a BIG favor and give us a review to help me grow my little business and boost our motivation?', 'formidable' ) . '<br/>' .
170	145	'- Steph Wells<br/>' .
171	146	'<span>' . esc_html__( 'Co-Founder and CTO of Formidable Forms', 'formidable' ) . '<span>',
172	147	'subject' => str_replace( $name, '', $title ),
173		- 'cta' => '<a href="https://wordpress.org/support/plugin/formidable/reviews/?filter=5#new-post" class="frm-dismiss-review-notice frm-review-out button frm-button-secondary" data-link="yes" target="_blank" rel="noopener noreferrer">' .
	148	+ 'cta' => '<a href="https://wordpress.org/support/plugin/formidable/reviews/?filter=5#new-post" class="frm-dismiss-review-notice frm-review-out button-secondary frm-button-secondary" data-link="yes" target="_blank" rel="noopener noreferrer">' .
174	149	esc_html__( 'Ok, you deserve it', 'formidable' ) . '</a>',
175	150	'type' => 'feedback',
176	151	)
177	152	);
		@@ -180,13 +155,8 @@
180	155	/**
181	156	* If there are already later requests, don't add it to the inbox again.
182	157	*
183	158	* @since 4.05.02
184		- *
185		- * @param array $requests Array of requests.
186		- * @param int $asked Number of times the review has been asked.
187		- *
188		- * @return bool
189	159	*/
190	160	private function has_later_request( $requests, $asked ) {
191	161	return isset( $requests[ $this->inbox_key . ( $asked + 1 ) ] ) || isset( $requests[ $this->inbox_key . ( $asked + 2 ) ] );
192	162	}
		@@ -192,10 +162,8 @@
192	162	}
193	163
194	164	/**
195	165	* @since 4.05.02
196		- *
197		- * @return array
198	166	*/
199	167	private function inbox_keys() {
200	168	return array(
201	169	$this->inbox_key,
		@@ -205,14 +173,11 @@
205	173	}
206	174
207	175	/**
208	176	* @since 4.05.01
209		- *
210		- * @return void
211	177	*/
212	178	private function set_inbox_dismissed() {
213	179	$message = new FrmInbox();
214		-
215	180	foreach ( $this->inbox_keys() as $key ) {
216	181	$message->dismiss( $key );
217	182	}
218	183	}
		@@ -218,14 +183,11 @@
218	183	}
219	184
220	185	/**
221	186	* @since 4.05.01
222		- *
223		- * @return void
224	187	*/
225	188	private function set_inbox_read() {
226	189	$message = new FrmInbox();
227		-
228	190	foreach ( $this->inbox_keys() as $key ) {
229	191	$message->mark_read( $key );
230	192	}
231	193	}
		@@ -233,10 +195,8 @@
233	195	/**
234	196	* Save the request to hide the review
235	197	*
236	198	* @since 3.04.03
237		- *
238		- * @return void
239	199	*/
240	200	public function dismiss_review() {
241	201	FrmAppHelper::permission_check( 'frm_change_settings' );
242	202	check_ajax_referer( 'frm_ajax', 'nonce' );
		@@ -242,9 +202,8 @@
242	202	check_ajax_referer( 'frm_ajax', 'nonce' );
243	203
244	204	$user_id = get_current_user_id();
245	205	$review = get_user_meta( $user_id, $this->option_name, true );
246		-
247	206	if ( empty( $review ) ) {
248	207	$review = array();
249	208	}
250	209