← All changes | classes/models/FrmReviews.php +6 -24 6.26 → 6.7 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
		@@ -38,14 +29,13 @@
38	29	$this->set_review_status();
39	30
40	31	// Check if it has been dismissed or if we can ask later
41	32	$dismissed = $this->review_status['dismissed'];
42		-
43	33	if ( $dismissed === 'later' && $this->review_status['asked'] < 3 ) {
44	34	$dismissed = false;
45	35	}
46	36
47		- $week_ago = $this->review_status['time'] + WEEK_IN_SECONDS <= time();
	37	+ $week_ago = ( $this->review_status['time'] + WEEK_IN_SECONDS ) <= time();
48	38
49	39	if ( empty( $dismissed ) && $week_ago ) {
50	40	$this->review();
51	41	}
		@@ -113,18 +103,17 @@
113	103	} else {
114	104	// round to the nearest 50
115	105	$entries = floor( $entries / 50 ) * 50;
116	106	}
117		-
118	107	$name = $user->first_name;
119		-
120	108	if ( ! empty( $name ) ) {
121	109	$name = ' ' . $name;
122	110	}
123	111
124	112	$title = sprintf(
125		- /* translators: %1$d: number of entries */
126		- esc_html__( 'You have collected %1$d form submissions.', 'formidable' ),
	113	+ /* translators: %s: User name, %2$d: number of entries */
	114	+ esc_html__( 'Congratulations%1$s! You have collected %2$d form submissions.', 'formidable' ),
	115	+ esc_html( $name ),
127	116	absint( $entries )
128	117	);
129	118
130	119	$this->add_to_inbox( $title, $name, $asked );
		@@ -129,9 +118,9 @@
129	118
130	119	$this->add_to_inbox( $title, $name, $asked );
131	120
132	121	// We have a candidate! Output a review message.
133		- include FrmAppHelper::plugin_path() . '/classes/views/shared/review.php';
	122	+ include( FrmAppHelper::plugin_path() . '/classes/views/shared/review.php' );
134	123	}
135	124
136	125	/**
137	126	* @param string $title
		@@ -140,9 +129,9 @@
140	129	*
141	130	* @return void
142	131	*/
143	132	private function add_to_inbox( $title, $name, $asked ) {
144		- $message = new FrmInbox();
	133	+ $message = new FrmInbox();
145	134	$requests = $message->get_messages();
146	135	$key = $this->inbox_key . ( $asked ? $asked : '' );
147	136
148	137	if ( isset( $requests[ $key ] ) ) {
		@@ -152,9 +141,8 @@
152	141	// Remove previous requests.
153	142	if ( $asked > 0 ) {
154	143	$message->remove( $this->inbox_key );
155	144	}
156		-
157	145	if ( $asked > 1 ) {
158	146	$message->remove( $this->inbox_key . '1' );
159	147	}
160	148
		@@ -181,11 +169,8 @@
181	169	* If there are already later requests, don't add it to the inbox again.
182	170	*
183	171	* @since 4.05.02
184	172	*
185		- * @param array $requests Array of requests.
186		- * @param int $asked Number of times the review has been asked.
187		- *
188	173	* @return bool
189	174	*/
190	175	private function has_later_request( $requests, $asked ) {
191	176	return isset( $requests[ $this->inbox_key . ( $asked + 1 ) ] ) || isset( $requests[ $this->inbox_key . ( $asked + 2 ) ] );
		@@ -210,9 +195,8 @@
210	195	* @return void
211	196	*/
212	197	private function set_inbox_dismissed() {
213	198	$message = new FrmInbox();
214		-
215	199	foreach ( $this->inbox_keys() as $key ) {
216	200	$message->dismiss( $key );
217	201	}
218	202	}
		@@ -223,9 +207,8 @@
223	207	* @return void
224	208	*/
225	209	private function set_inbox_read() {
226	210	$message = new FrmInbox();
227		-
228	211	foreach ( $this->inbox_keys() as $key ) {
229	212	$message->mark_read( $key );
230	213	}
231	214	}
		@@ -242,9 +225,8 @@
242	225	check_ajax_referer( 'frm_ajax', 'nonce' );
243	226
244	227	$user_id = get_current_user_id();
245	228	$review = get_user_meta( $user_id, $this->option_name, true );
246		-
247	229	if ( empty( $review ) ) {
248	230	$review = array();
249	231	}
250	232