← All changes | classes/models/FrmPluginSearch.php +31 -40 6.28 → 6.2 View file →

		@@ -25,12 +25,12 @@
25	25
26	26	/**
27	27	* Add actions and filters only if this is the plugin installation screen and it's the first page.
28	28	*
	29	+ * @param object $screen WP Screen object.
	30	+ *
29	31	* @since 4.12
30	32	*
31		- * @param object $screen WP Screen object.
32		- *
33	33	* @return void
34	34	*/
35	35	public function start( $screen ) {
36	36	// phpcs:ignore WordPress.Security.NonceVerification.Recommended
		@@ -57,19 +57,13 @@
57	57	if ( empty( $args->search ) ) {
58	58	return $result;
59	59	}
60	60
61		- if ( is_wp_error( $result ) ) {
62		- // This may happen if the request failed due to an internet connection issue.
63		- return $result;
64		- }
65		-
66	61	$addon_list = $this->get_addons();
67	62
68	63	// Lowercase, trim, remove punctuation/special chars, decode url, remove 'formidable'.
69	64	$normalized_term = $this->search_to_array( $args->search );
70		-
71		- if ( ! $normalized_term ) {
	65	+ if ( empty( $normalized_term ) ) {
72	66	// Don't add anything extra.
73	67	return $result;
74	68	}
75	69
		@@ -74,25 +68,24 @@
74	68	}
75	69
76	70	$matching_addon = $this->matching_addon( $addon_list, $normalized_term );
77	71
78		- if ( ! $matching_addon || ! $this->should_display_hint( $matching_addon ) ) {
	72	+ if ( empty( $matching_addon ) || ! $this->should_display_hint( $matching_addon ) ) {
79	73	return $result;
80	74	}
81	75
82	76	$inject = (array) $this->get_plugin_data();
83	77	$overrides = array(
84		- // Helps to determine if that an injected card.
85		- 'plugin-search' => true,
86		- 'name' => sprintf(
	78	+ 'plugin-search' => true, // Helps to determine if that an injected card.
	79	+ 'name' => sprintf(
87	80	/* translators: Formidable addon name */
88	81	esc_html_x( 'Formidable %s', 'Formidable Addon Name', 'formidable' ),
89	82	$addon_list[ $matching_addon ]['name']
90	83	),
91		- 'addon' => $addon_list[ $matching_addon ]['slug'],
92		- 'short_description' => $addon_list[ $matching_addon ]['excerpt'],
93		- 'slug' => self::$slug,
94		- 'version' => $addon_list[ $matching_addon ]['version'],
	84	+ 'addon' => $addon_list[ $matching_addon ]['slug'],
	85	+ 'short_description' => $addon_list[ $matching_addon ]['excerpt'],
	86	+ 'slug' => self::$slug,
	87	+ 'version' => $addon_list[ $matching_addon ]['version'],
95	88	);
96	89
97	90	if ( ! empty( $addon_list[ $matching_addon ]['external'] ) ) {
98	91	unset( $overrides['name'] );
		@@ -129,12 +122,13 @@
129	122	if ( ! isset( $addon_opts['search_terms'] ) ) {
130	123	$addon_opts['search_terms'] = '';
131	124	}
132	125
133		- $addon_terms = $this->search_to_array( $addon_opts['search_terms'] . ' ' . $addon_opts['name'] );
134		- $matched_terms = array_intersect( $addon_terms, $normalized_term );
	126	+ $addon_terms = $this->search_to_array( $addon_opts['search_terms'] . ' ' . $addon_opts['name'] );
135	127
136		- if ( count( $matched_terms ) === count( $normalized_term ) ) {
	128	+ $matches = ! empty( array_intersect( $addon_terms, $normalized_term ) );
	129	+
	130	+ if ( $matches ) {
137	131	$matching_addon = $addon_id;
138	132	break;
139	133	}
140	134	}
		@@ -187,20 +181,18 @@
187	181
188	182	/**
189	183	* Modify URL used to fetch to plugin information so it pulls Formidable plugin page.
190	184	*
	185	+ * @param string $url URL to load in dialog pulling the plugin page from wporg.
	186	+ *
191	187	* @since 4.12
192	188	*
193		- * @param string $url URL to load in dialog pulling the plugin page from wporg.
194		- *
195	189	* @return string The URL with 'formidable' instead of 'frm-plugin-search'.
196	190	*/
197	191	public function plugin_details( $url ) {
198		- // phpcs:disable Generic.WhiteSpace.ScopeIndent
199	192	return false !== stripos( $url, 'tab=plugin-information&plugin=' . self::$slug )
200	193	? 'plugin-install.php?tab=plugin-information&plugin=formidable&TB_iframe=true&width=600&height=550'
201	194	: $url;
202		- // phpcs:enable Generic.WhiteSpace.ScopeIndent
203	195	}
204	196
205	197	/**
206	198	* @since 4.12
		@@ -208,10 +200,9 @@
208	200	* @return void
209	201	*/
210	202	private function maybe_dismiss() {
211	203	$addon = FrmAppHelper::get_param( 'frm-dismiss', '', 'get', 'absint' );
212		-
213		- if ( $addon ) {
	204	+ if ( ! empty( $addon ) ) {
214	205	$this->add_to_dismissed_hints( $addon );
215	206	}
216	207	}
217	208
		@@ -223,9 +214,9 @@
223	214	* @return array List of dismissed hints.
224	215	*/
225	216	protected function get_dismissed_hints() {
226	217	$dismissed_hints = get_option( self::$dismissed_opt );
227		- return $dismissed_hints && is_array( $dismissed_hints ) ? $dismissed_hints : array();
	218	+ return ! empty( $dismissed_hints ) && is_array( $dismissed_hints ) ? $dismissed_hints : array();
228	219	}
229	220
230	221	/**
231	222	* Save the hint in the list of dismissed hints.
		@@ -237,9 +228,9 @@
237	228	* @return bool Whether the card was added to the list and hence dismissed.
238	229	*/
239	230	protected function add_to_dismissed_hints( $hint ) {
240	231	$hints = array_merge( $this->get_dismissed_hints(), array( $hint ) );
241		- return update_option( self::$dismissed_opt, $hints, false );
	232	+ return update_option( self::$dismissed_opt, $hints, 'no' );
242	233	}
243	234
244	235	/**
245	236	* Checks that the addon slug passed should be displayed.
		@@ -267,19 +258,20 @@
267	258	* Take a raw search query and return something a bit more standardized and
268	259	* easy to work with.
269	260	*
270	261	* @param string $term The raw search term.
271		- *
272	262	* @return string A simplified/sanitized version.
273	263	*/
274	264	private function sanitize_search_term( $term ) {
275	265	$term = strtolower( urldecode( $term ) );
276	266
277		- // Remove non-alpha/space chars.
	267	+ // remove non-alpha/space chars.
278	268	$term = preg_replace( '/[^a-z ]/', '', $term );
279	269
280		- // Remove strings that don't help matches.
281		- return trim( str_replace( array( 'formidable', 'free', 'wordpress', 'wp ', 'plugin' ), '', $term ) );
	270	+ // remove strings that don't help matches.
	271	+ $term = trim( str_replace( array( 'formidable', 'free', 'wordpress', 'wp ', 'plugin' ), '', $term ) );
	272	+
	273	+ return $term;
282	274	}
283	275
284	276	/**
285	277	* @since 4.12
		@@ -284,9 +276,8 @@
284	276	/**
285	277	* @since 4.12
286	278	*
287	279	* @param string $terms
288		- *
289	280	* @return array
290	281	*/
291	282	private function search_to_array( $terms ) {
292	283	$terms = $this->sanitize_search_term( $terms );
		@@ -308,9 +299,9 @@
308	299
309	300	// By the time this filter is applied, self_admin_url was already applied and we don't need it anymore.
310	301	remove_filter( 'self_admin_url', array( $this, 'plugin_details' ) );
311	302
312		- $links = array();
	303	+ $links = array();
313	304	$is_installed = $this->is_installed( $plugin['plugin'] );
314	305	$is_active = is_plugin_active( $plugin['plugin'] );
315	306
316	307	// Plugin installed, active, feature not enabled; prompt to enable.
		@@ -315,17 +306,17 @@
315	306
316	307	// Plugin installed, active, feature not enabled; prompt to enable.
317	308	if ( ! $is_active && $is_installed ) {
318	309	if ( current_user_can( 'activate_plugins' ) ) {
319		- $activate_url = add_query_arg(
	310	+ $activate_url = add_query_arg(
320	311	array(
321		- 'action' => 'activate',
	312	+ 'action' => 'activate',
322	313	'_wpnonce' => wp_create_nonce( 'activate-plugin_' . $plugin['plugin'] ),
323	314	'plugin' => $plugin['plugin'],
324	315	),
325	316	admin_url( 'plugins.php' )
326	317	);
327		- $links['frm_get_started'] = '<a href="' . esc_url( $activate_url ) . '" class="button activate-now" aria-label="Activate ' . esc_attr( $plugin['name'] ) . '">' . esc_html__( 'Activate', 'formidable' ) . '</a>'; // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
	318	+ $links['frm_get_started'] = '<a href="' . esc_url( $activate_url ) . '" class="button activate-now" aria-label="Activate ' . esc_attr( $plugin['name'] ) . '">' . __( 'Activate', 'formidable' ) . '</a>';
328	319	}
329	320	} elseif ( ! $is_active && isset( $plugin['url'] ) ) {
330	321	// Go to the add-ons page to install.
331	322	$links[] = '<a
		@@ -330,9 +321,10 @@
330	321	// Go to the add-ons page to install.
331	322	$links[] = '<a
332	323	class="button-secondary"
333	324	href="' . esc_url( admin_url( 'admin.php?page=formidable-addons' ) ) . '"
334		- >' . esc_html__( 'Install Now', 'formidable' ) . '</a>';
	325	+ >' . __( 'Install Now', 'formidable' ) . '</a>';
	326	+
335	327	} elseif ( ! empty( $plugin['link'] ) ) {
336	328	// Add link pointing to a relevant doc page in formidable.com.
337	329	$links[] = '<a
338	330	class="button-primary frm-plugin-search__learn-more"
		@@ -339,9 +331,9 @@
339	331	href="' . esc_url( FrmAppHelper::admin_upgrade_link( 'plugin-learn-more', $plugin['link'] ) ) . '"
340	332	target="_blank"
341	333	data-addon="' . esc_attr( $plugin['addon'] ) . '"
342	334	>' . esc_html__( 'Learn more', 'formidable' ) . '</a>';
343		- }//end if
	335	+ }
344	336
345	337	// Dismiss link.
346	338	$dismiss = add_query_arg( array( 'frm-dismiss' => $plugin['id'] ) );
347	339	$links[] = '<a
		@@ -354,9 +346,8 @@
354	346	}
355	347
356	348	/**
357	349	* @param string $plugin
358		- *
359	350	* @return bool
360	351	*/
361	352	protected function is_installed( $plugin ) {
362	353	$all_plugins = FrmAppHelper::get_plugins();