← All changes | class/class-mainwp-api-handler.php +27 -36 5.0.3.2 → 4.1 View file →

		@@ -26,11 +26,8 @@
26	26	/**
27	27	* Check if extension has an update.
28	28	*
29	29	* @return array $output List of results.
30		- *
31		- * @uses MainWP_Api_Manager_Plugin_Update::bulk_update_check()
32		- * @uses \MainWP\Dashboard\MainWP_Extensions_Handler::get_extensions()
33	30	*/
34	31	public static function check_exts_upgrade() {
35	32
36	33	$extensions = MainWP_Extensions_Handler::get_extensions();
		@@ -42,8 +39,9 @@
42	39	$args['plugin_name'] = $ext['api'];
43	40	$args['version'] = $ext['version'];
44	41	$args['product_id'] = $ext['product_id'];
45	42	$args['api_key'] = $ext['api_key'];
	43	+ $args['activation_email'] = $ext['activation_email'];
46	44	$args['instance'] = $ext['instance_id'];
47	45	$args['software_version'] = $ext['software_version'];
48	46	$check_exts[ $args['plugin_name'] ] = $args;
49	47	}
		@@ -60,26 +58,23 @@
60	58	$bulk_checks = array();
61	59
62	60	foreach ( $check_exts as $ext_name => $ext ) {
63	61	$bulk_checks[ $ext_name ] = $ext;
64		- ++$i;
65		- ++$count;
66		- if ( $count === $max_check || $i === $total_check ) {
67		- $results = MainWP_Api_Manager_Plugin_Update::instance()->bulk_update_check( $bulk_checks ); // bulk check response array of info.
	62	+ $i++;
	63	+ $count++;
	64	+ if ( $count == $max_check || $i == $total_check ) {
	65	+ $results = MainWP_Api_Manager_Plugin_Update::instance()->bulk_update_check( $bulk_checks );
68	66	if ( is_array( $results ) && 0 < count( $results ) ) {
69	67	foreach ( $results as $slug => $response ) {
70		- if ( ! is_array( $response ) || ! isset( $response['new_version'] ) ) {
71		- continue;
72		- }
73		- $rslt = new \stdClass();
74		- $rslt->slug = $slug;
75		- $rslt->new_version = $response['new_version'];
76		- $rslt->package = $response['package'];
77		- $rslt->key_status = '';
78		- $rslt->apiManager = 1;
	68	+ $rslt = new \stdClass();
	69	+ $rslt->slug = $slug;
	70	+ $rslt->latest_version = $response->new_version;
	71	+ $rslt->download_url = $response->package;
	72	+ $rslt->key_status = '';
	73	+ $rslt->apiManager = 1;
79	74
80		- if ( isset( $response['errors'] ) ) {
81		- $rslt->error = $response['errors'];
	75	+ if ( isset( $response->errors ) ) {
	76	+ $rslt->error = $response->errors;
82	77	}
83	78	$output[ $slug ] = $rslt;
84	79	}
85	80	}
		@@ -96,11 +91,8 @@
96	91	*
97	92	* @param string $pSlug Extension slug.
98	93	*
99	94	* @return array $rslt An array containing update information.
100		- *
101		- * @uses \MainWP\Dashboard\MainWP_Api_Manager::update_check()
102		- * @uses \MainWP\Dashboard\MainWP_Extensions_Handler::get_extensions()
103	95	*/
104	96	public static function get_upgrade_information( $pSlug ) {
105	97
106	98	$extensions = MainWP_Extensions_Handler::get_extensions();
		@@ -105,25 +97,25 @@
105	97
106	98	$extensions = MainWP_Extensions_Handler::get_extensions();
107	99	$rslt = null;
108	100	foreach ( $extensions as $ext ) {
109		- if ( isset( $ext['api'] ) && ( $pSlug === $ext['api'] ) && isset( $ext['apiManager'] ) && ! empty( $ext['apiManager'] ) ) {
	101	+ if ( isset( $ext['api'] ) && ( $pSlug == $ext['api'] ) && isset( $ext['apiManager'] ) && ! empty( $ext['apiManager'] ) ) {
110	102	$args = array();
111	103	$args['plugin_name'] = $ext['api'];
112	104	$args['version'] = $ext['version'];
113	105	$args['product_id'] = $ext['product_id'];
114	106	$args['api_key'] = $ext['api_key'];
	107	+ $args['activation_email'] = $ext['activation_email'];
115	108	$args['instance'] = $ext['instance_id'];
116	109	$args['software_version'] = $ext['software_version'];
117		- $response = MainWP_Api_Manager_Plugin_Update::instance()->update_check( $args );
118		-
	110	+ $response = MainWP_Api_Manager::instance()->update_check( $args );
119	111	if ( ! empty( $response ) ) {
120		- $rslt = new \stdClass();
121		- $rslt->slug = $ext['api'];
122		- $rslt->new_version = $response->new_version;
123		- $rslt->package = $response->package;
124		- $rslt->key_status = '';
125		- $rslt->apiManager = 1;
	112	+ $rslt = new \stdClass();
	113	+ $rslt->slug = $ext['api'];
	114	+ $rslt->latest_version = $response->new_version;
	115	+ $rslt->download_url = $response->package;
	116	+ $rslt->key_status = '';
	117	+ $rslt->apiManager = 1;
126	118	if ( isset( $response->errors ) ) {
127	119	$rslt->error = $response->errors;
128	120	}
129	121	}
		@@ -138,27 +130,26 @@
138	130	*
139	131	* @param string $pSlug Extension slug.
140	132	*
141	133	* @return array $rslt An array containing extension information.
142		- *
143		- * @uses \MainWP\Dashboard\MainWP_Api_Manager::request_extension_information()
144		- * @uses \MainWP\Dashboard\MainWP_Extensions_Handler::get_extensions()
145	134	*/
146		- public static function get_update_information( $pSlug ) {
	135	+ public static function get_plugin_information( $pSlug ) {
147	136	$extensions = MainWP_Extensions_Handler::get_extensions();
148	137	$rslt = null;
149	138	foreach ( $extensions as $ext ) {
150		- if ( isset( $ext['api'] ) && $pSlug === $ext['api'] && isset( $ext['apiManager'] ) && ! empty( $ext['apiManager'] ) ) {
	139	+ if ( $pSlug == $ext['api'] && isset( $ext['apiManager'] ) && ! empty( $ext['apiManager'] ) ) {
151	140	$args = array();
152	141	$args['plugin_name'] = $ext['api'];
153	142	$args['version'] = $ext['version'];
154	143	$args['product_id'] = $ext['product_id'];
155	144	$args['api_key'] = $ext['api_key'];
	145	+ $args['activation_email'] = $ext['activation_email'];
156	146	$args['instance'] = $ext['instance_id'];
157	147	$args['software_version'] = $ext['software_version'];
158		- $rslt = MainWP_Api_Manager::instance()->request_extension_information( $args );
	148	+ $rslt = MainWP_Api_Manager::instance()->request_plugin_information( $args );
159	149	break;
160	150	}
161	151	}
162	152	return $rslt;
163	153	}
	154	+
164	155	}