← All changes | modules/optimization/classes/optimization-status.php +17 -2 1.5.4 → 1.7.7 View file →

		@@ -6,9 +6,8 @@
6	6	Image_Meta,
7	7	Image_Optimization_Error_Type,
8	8	Image_Status
9	9	};
10		-use ImageOptimization\Modules\Oauth\Classes\Data;
11	10	use ImageOptimization\Modules\Stats\Classes\Optimization_Stats;
12	11
13	12	use ImageOptimization\Plugin;
14	13
		@@ -24,14 +23,28 @@
24	23	* @return array
25	24	*/
26	25	public static function get_images_optimization_statuses( array $image_ids ): array {
27	26	$output = [];
28		- $images_left = Plugin::instance()->modules_manager->get_modules( 'connect-manager' )->connect_instance->images_left();
29	27
	28	+ // @var ImageOptimizer/Modules/ConnectManager/Module
	29	+ $module = Plugin::instance()->modules_manager->get_modules( 'connect-manager' );
	30	+ $images_left = $module->connect_instance->images_left();
	31	+ $is_connected = $module->connect_instance->is_connected() && $module->connect_instance->is_activated();
	32	+
30	33	foreach ( $image_ids as $image_id ) {
31	34	$meta = new Image_Meta( $image_id );
32	35	$data = [];
33	36
	37	+ if ( ! $is_connected ) {
	38	+ $data['status'] = Image_Status::OPTIMIZATION_FAILED;
	39	+ $data['error_type'] = Image_Optimization_Error_Type::AUTH_ERROR;
	40	+ $data['message'] = esc_html__( 'You need to connect an Elementor account', 'image-optimization' );
	41	+
	42	+ $output[ $image_id ] = $data;
	43	+
	44	+ continue;
	45	+ }
	46	+
34	47	$status = $meta->get_status();
35	48
36	49	$data['status'] = $status;
37	50
		@@ -46,8 +59,9 @@
46	59	if ( Image_Status::OPTIMIZATION_FAILED === $status ) {
47	60	$error_type = $meta->get_error_type() ?? Image_Optimization_Error_Type::GENERIC;
48	61	$error_message = Optimization_Error_Message::get_optimization_error_message( $error_type );
49	62
	63	+ $data['error_type'] = $error_type;
50	64	$data['message'] = $error_message;
51	65	$data['images_left'] = $images_left;
52	66	}
53	67
		@@ -54,8 +68,9 @@
54	68	if ( Image_Status::REOPTIMIZING_FAILED === $status ) {
55	69	$error_type = $meta->get_error_type() ?? Image_Optimization_Error_Type::GENERIC;
56	70	$error_message = Optimization_Error_Message::get_reoptimization_error_message( $error_type );
57	71
	72	+ $data['error_type'] = $error_type;
58	73	$data['message'] = $error_message;
59	74	$data['images_left'] = $images_left;
60	75	}
61	76