← All changes | vendor/codeinwp/themeisle-sdk/src/Modules/Dashboard_widget.php +36 -79 4.0.7 → 3.4.9 View file →

		@@ -11,9 +11,8 @@
11	11
12	12	namespace ThemeisleSDK\Modules;
13	13
14	14	use ThemeisleSDK\Common\Abstract_Module;
15		-use ThemeisleSDK\Loader;
16	15	use ThemeisleSDK\Product;
17	16
18	17	// Exit if accessed directly.
19	18	if ( ! defined( 'ABSPATH' ) ) {
		@@ -76,14 +75,13 @@
76	75	if ( apply_filters( 'themeisle_sdk_hide_dashboard_widget', false ) ) {
77	76	return;
78	77	}
79	78	$this->product = $product;
80		- $this->dashboard_name = apply_filters( 'themeisle_sdk_dashboard_widget_name', Loader::$labels['dashboard_widget']['title'] );
	79	+ $this->dashboard_name = apply_filters( 'themeisle_sdk_dashboard_widget_name', 'WordPress Guides/Tutorials' );
81	80	$this->feeds = apply_filters(
82	81	'themeisle_sdk_dashboard_widget_feeds',
83	82	[
84	83	'https://themeisle.com/blog/feed',
85		- 'https://wpshout.com/feed',
86	84	]
87	85	);
88	86	add_action( 'wp_dashboard_setup', array( &$this, 'add_widget' ) );
89	87	add_action( 'wp_network_dashboard_setup', array( &$this, 'add_widget' ) );
		@@ -97,9 +95,9 @@
97	95	* Add widget to the dashboard
98	96	*
99	97	* @return string|void
100	98	*/
101		- public function add_widget() {
	99	+ function add_widget() {
102	100	global $wp_meta_boxes;
103	101	if ( isset( $wp_meta_boxes['dashboard']['normal']['core']['themeisle'] ) ) {
104	102	return;
105	103	}
		@@ -115,9 +113,9 @@
115	113
116	114	/**
117	115	* Render widget content
118	116	*/
119		- public function render_dashboard_widget() {
	117	+ function render_dashboard_widget() {
120	118	$this->setup_feeds();
121	119	if ( empty( $this->items ) || ! is_array( $this->items ) ) {
122	120	return;
123	121	}
		@@ -122,12 +120,8 @@
122	120	return;
123	121	}
124	122	?>
125	123	<style type="text/css">
126		- #dashboard-widgets #themeisle .hndle {
127		- padding-left: 39px;
128		- }
129		-
130	124	#themeisle ul li.ti-dw-recommend-item {
131	125	padding-left: 7px;
132	126	border-top: 1px solid #eee;
133	127	margin-bottom: 0px;
		@@ -136,9 +130,9 @@
136	130
137	131	#themeisle h2.hndle {
138	132	background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEgAAABbCAMAAADncTNAAAAAtFBMVEVHcEyAgIB/f3+xsbGgoaGBgYGCgoKKioqAgIC1tbW5ubnFx8iAgIDU1taBgYGCgoKAgIC0tLXW19jW2NiAgIC3uLiBgYHLzMy4uLhycnLW19d/f3/T1NW0tLTX19mVlZWvr6+BgYHl5eWKiottbW5JSUnW2Nm5ubnh4eHT1NWVlZVjY2N4eHh9fX6pqqq+v79PT0/39/fu7u7Nzc7Z2ttYWFgBAQHDw8P////JysoZGRk0NTZqJc/sAAAAIXRSTlMA0FL7/oEnEPL6eibivm9gwJya76/enFq2CXI+2lFAyM8GATmPAAADj0lEQVR4Xu2YaW/iOhSGAwRCWDosnXa6znjJvm8svf//f12TuARyhiR2pfnUR6gSEnr0+uT4xK7yRb755pvhHePli5K7Bfpkuhoq8ozRJdMH+WWha6Z3sqYparCSLRJqspjImVbANJU03cNMMpofAwQZCGsmpQYyFvVM0Q00OQ9koMl5IPcCoro+RA1Dt2Ea9n9eZ0+YHJLkgIlkDywQx00wCTyaReiKH8LbNU9ybJOdkchV6QFxyCFLbVvdfaREqgUWg/tx2UbqIcK2Hex2TdGLwFTjIj3XP3YfCZFsb23KRZn/3263oymSFI0/a5S4PqUBjoBIJBDjeEhCN0wxQSRybIxtJ3K5SGzuE/vAwIQc8ZmMMJFAIM4oikZItfEFtorGgoE43FObwqHU68OtPCnOz8KZ2Jbl5LgkSW0Tc7YyIz/EFWmS4jMbiZU5mJOmKRaJpKGGyLZtDJh3iyaNUu/3+xyKnrtFL71EG+FTiMpENhQtxUQ8kSOXCIr2tnCNhg/gTX0SHYFp0t7TCwQZ7U841yoHrW6rtGroUwTWVnLMssxx+H4bgZcSOFf5MYx0Ae8FghomMDyC2EBNImBywPkNTDNqGLQpIg2TjUNU8tBy9DQMo0DAZF16rAi7vJAtFTIYFAHUc6hIRW6OuOhJgaCSwmDEAYK4oa7ro+qIEyJU/US7KTJKPNSFT9tFgVFBu0SF1y7yjX4masRA9Da7EFGj28R/BkQz6xGIOurkx38T/bKs9Uk8aIiMwm/Jw0VP1yLrJwt13xAxvABBgsK4KWLov35DkRF7ZaqgzuZ7MQ8MOntmVYyAqKTwaICKqvSUFnVccMN5sziEP/5+xGDTahbH5Q3ZB76zr8fI+nJtvUUU3t3ml5GKviK/npCg3CGodnuJ4JVkfRFJYGVDBZrqKnn9RLf+CzDTS5PaN5J38+auzX4ykU4Qoj0rdKfcYs5ijfo9OL/uRUgZyQr7NCWtWwiUSLc4arfJa7lpszTA1OJZAQ8w8dXFrR5YHzCWSnS3pZ18tOi4Ps4vl/c7i/6qomjRecN+UubrPyPGn/VEMU3T0UFHkaPzpgjxmJsnjmrtionlMDZiog0TsY/DPtn8SXtlBvbtxKtwopy7lqW3smQO+yoGE1Uu55GJ3pmI8ygoejZNnqj0vnIRCyTKfLstRdtStGQi09myUsvwvlkuzSUXbV+Xz5ryBebV33fln/A/moud69FZiEYAAAAASUVORK5CYII=');
139	133	background-repeat: no-repeat;
140		- background-position: 2% 50%;
	134	+ background-position: 92% 50%;
141	135	background-size: 25px;
142	136	}
143	137
144	138	#themeisle .inside {
		@@ -225,23 +219,21 @@
225	219	?>
226	220	<li class="ti-dw-feed-item">
227	221	<a href="
228	222	<?php
229		- echo esc_url(
230		- add_query_arg(
231		- array(
232		- 'utm_source' => 'wpadmin',
233		- 'utm_campaign' => 'feed',
234		- 'utm_medium' => 'dashboard_widget',
235		- ),
236		- $item['link']
237		- )
	223	+ echo add_query_arg(
	224	+ array(
	225	+ 'utm_source' => 'wpadmin',
	226	+ 'utm_campaign' => 'feed',
	227	+ 'utm_medium' => 'dashboard_widget',
	228	+ ),
	229	+ $item['link']
238	230	);
239	231	?>
240	232	" target="_blank">
241	233	<span class="ti-dw-date-container"><span
242		- class="ti-dw-day-container"><?php echo esc_attr( gmdate( 'd', $item['date'] ) ); ?></span> <span
243		- class="ti-dw-month-container"><?php echo esc_attr( substr( gmdate( 'M', $item['date'] ), 0, 3 ) ); ?></span></span><?php echo esc_attr( $item['title'] ); ?>
	234	+ class="ti-dw-day-container"><?php echo date( 'd', $item['date'] ); ?></span> <span
	235	+ class="ti-dw-month-container"><?php echo substr( date( 'M', $item['date'] ), 0, 3 ); ?></span></span><?php echo $item['title']; ?>
244	236	</a>
245	237	</li>
246	238	<?php
247	239	}
		@@ -282,30 +274,28 @@
282	274	}
283	275	?>
284	276	<div class="ti-dw-footer">
285	277	<span class="ti-dw-recommend-item ">
286		- <span class="ti-dw-recommend"><?php echo esc_attr( apply_filters( 'themeisle_sdk_dashboard_popular_label', sprintf( Loader::$labels['dashboard_widget']['popular'], ucwords( $type ) ) ) ); ?>
	278	+ <span class="ti-dw-recommend"><?php echo apply_filters( 'themeisle_sdk_dashboard_popular_label', sprintf( 'Popular %s', ucwords( $type ) ) ); ?>
287	279	: </span>
288	280	<?php
289		- echo esc_attr(
290		- trim(
291		- str_replace(
292		- array(
293		- 'lite',
294		- 'Lite',
295		- '(Lite)',
296		- '(lite)',
297		- ),
298		- '',
299		- $recommend['name']
300		- )
	281	+ echo trim(
	282	+ str_replace(
	283	+ array(
	284	+ 'lite',
	285	+ 'Lite',
	286	+ '(Lite)',
	287	+ '(lite)',
	288	+ ),
	289	+ '',
	290	+ $recommend['name']
301	291	)
302	292	);
303	293	?>
304	294	(<a class="thickbox open-plugin-details-modal"
305		- href="<?php echo esc_url( $url . '&TB_iframe=true&width=600&height=500' ); ?>"><?php echo esc_attr( apply_filters( 'themeisle_sdk_dashboard_install_label', Loader::$labels['dashboard_widget']['install'] ) ); ?></a>)
	295	+ href="<?php echo $url . '&TB_iframe=true&width=600&height=500'; ?>"><?php echo apply_filters( 'themeisle_sdk_dashboard_install_label', 'Install' ); ?></a>)
306	296	</span>
307		- <span class="ti-dw-powered-by"><span><?php echo esc_attr( apply_filters( 'themeisle_sdk_dashboard_widget_powered_by', sprintf( Loader::$labels['dashboard_widget']['powered'], $this->product->get_friendly_name() ) ) ); ?></span></span>
	297	+ <span class="ti-dw-powered-by"><span><?php echo apply_filters( 'themeisle_sdk_dashboard_widget_powered_by', esc_attr( sprintf( 'Powered by %s', $this->product->get_friendly_name() ) ) ); ?></span></span>
308	298	</div>
309	299
310	300	<?php
311	301
		@@ -314,40 +304,11 @@
314	304	/**
315	305	* Setup feed items.
316	306	*/
317	307	private function setup_feeds() {
318		- if ( false === ( $items_normalized = get_transient( 'themeisle_sdk_feed_items' ) ) ) { //phpcs:ignore Squiz.PHP.DisallowMultipleAssignments.FoundInControlStructure
319		- // Do not force the feed for the items in the sdk feeds list.
320		- // this prevents showing notices if another plugin will force all SimplePie feeds to load, instead it will
321		- // use the regular SimplePie validation and abort early if the feed is not valid.
322		- $sdk_feeds = $this->feeds;
323		- add_action(
324		- 'wp_feed_options',
325		- function ( $feed, $url ) use ( $sdk_feeds ) {
326		- if ( defined( 'TI_SDK_PHPUNIT' ) && true === TI_SDK_PHPUNIT ) {
327		- return;
328		- }
329		-
330		- if ( ! is_string( $url ) && in_array( $url, $sdk_feeds, true ) ) {
331		- $feed->force_feed( false );
332		-
333		- return;
334		- }
335		- if ( is_array( $url ) ) {
336		- foreach ( $url as $feed_url ) {
337		- if ( in_array( $feed_url, $sdk_feeds, true ) ) {
338		- $feed->force_feed( false );
339		-
340		- return;
341		- }
342		- }
343		- }
344		- },
345		- PHP_INT_MAX,
346		- 2
347		- );
	308	+ if ( false === ( $items_normalized = get_transient( 'themeisle_sdk_feed_items' ) ) ) {
348	309	// Load SimplePie Instance.
349		- $feed = fetch_feed( $sdk_feeds );
	310	+ $feed = fetch_feed( $this->feeds );
350	311	// TODO report error when is an error loading the feed.
351	312	if ( is_wp_error( $feed ) ) {
352	313	return;
353	314	}
		@@ -352,13 +313,9 @@
352	313	return;
353	314	}
354	315
355	316	$items = $feed->get_items( 0, 5 );
356		- $items = is_array( $items ) ? $items : [];
357		-
358		- $items_normalized = [];
359		-
360		- foreach ( $items as $item ) {
	317	+ foreach ( (array) $items as $item ) {
361	318	$items_normalized[] = array(
362	319	'title' => $item->get_title(),
363	320	'date' => $item->get_date( 'U' ),
364	321	'link' => $item->get_permalink(),
		@@ -395,9 +352,9 @@
395	352
396	353	/**
397	354	* Contact the API and fetch the recommended plugins/themes
398	355	*/
399		- public function recommend_plugin_or_theme() {
	356	+ function recommend_plugin_or_theme() {
400	357	$products = $this->get_product_from_api();
401	358	if ( ! is_array( $products ) ) {
402	359	$products = array();
403	360	}
		@@ -416,10 +373,10 @@
416	373	* Fetch products from the recomended section.
417	374	*
418	375	* @return array|mixed The list of products to use in recomended section.
419	376	*/
420		- public function get_product_from_api() {
421		- if ( false === ( $products = get_transient( 'themeisle_sdk_products' ) ) ) { //phpcs:ignore Squiz.PHP.DisallowMultipleAssignments.FoundInControlStructure
	377	+ function get_product_from_api() {
	378	+ if ( false === ( $products = get_transient( 'themeisle_sdk_products' ) ) ) {
422	379	$products = array();
423	380	$all_themes = $this->get_themes_from_wporg( 'themeisle' );
424	381	$all_plugins = $this->get_plugins_from_wporg( 'themeisle' );
425	382	static $allowed_products = [
		@@ -471,10 +428,10 @@
471	428	* @param string $author The author name.
472	429	*
473	430	* @return array The list of themes.
474	431	*/
475		- public function get_themes_from_wporg( $author ) {
476		- $products = $this->safe_get(
	432	+ function get_themes_from_wporg( $author ) {
	433	+ $products = wp_remote_get(
477	434	'https://api.wordpress.org/themes/info/1.1/?action=query_themes&request[author]=' . $author . '&request[per_page]=30&request[fields][active_installs]=true'
478	435	);
479	436	$products = json_decode( wp_remote_retrieve_body( $products ) );
480	437	if ( is_object( $products ) ) {
		@@ -492,10 +449,10 @@
492	449	* @param string $author The author slug.
493	450	*
494	451	* @return array The list of plugins for the selected author.
495	452	*/
496		- public function get_plugins_from_wporg( $author ) {
497		- $products = $this->safe_get(
	453	+ function get_plugins_from_wporg( $author ) {
	454	+ $products = wp_remote_get(
498	455	'https://api.wordpress.org/plugins/info/1.1/?action=query_plugins&request[author]=' . $author . '&request[per_page]=40&request[fields][active_installs]=true'
499	456	);
500	457	$products = json_decode( wp_remote_retrieve_body( $products ) );
501	458	if ( is_object( $products ) ) {