← All changes | modules/optimization/classes/optimization-status.php +29 -12 1.0.1 → 1.7.7 View file →

		@@ -1,16 +1,21 @@
1	1	<?php
2	2
3		-namespace ImageOptimizer\Modules\Optimization\Classes;
	3	+namespace ImageOptimization\Modules\Optimization\Classes;
4	4
5		-use ImageOptimizer\Classes\Image\{
	5	+use ImageOptimization\Classes\Image\{
6	6	Image_Meta,
7	7	Image_Optimization_Error_Type,
8	8	Image_Status
9	9	};
10		-use ImageOptimizer\Modules\Oauth\Classes\Data;
11		-use ImageOptimizer\Modules\Stats\Classes\Optimization_Stats;
	10	+use ImageOptimization\Modules\Stats\Classes\Optimization_Stats;
12	11
	12	+use ImageOptimization\Plugin;
	13	+
	14	+if ( ! defined( 'ABSPATH' ) ) {
	15	+ exit; // Exit if accessed directly.
	16	+}
	17	+
13	18	class Optimization_Status {
14	19	/**
15	20	*
16	21	*
		@@ -18,14 +23,28 @@
18	23	* @return array
19	24	*/
20	25	public static function get_images_optimization_statuses( array $image_ids ): array {
21	26	$output = [];
22		- $images_left = Data::images_left();
23	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	+
24	33	foreach ( $image_ids as $image_id ) {
25	34	$meta = new Image_Meta( $image_id );
26	35	$data = [];
27	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	+
28	47	$status = $meta->get_status();
29	48
30	49	$data['status'] = $status;
31	50
		@@ -33,17 +52,16 @@
33	52	$data['stats'] = Optimization_Stats::get_image_stats( $image_id );
34	53	}
35	54
36	55	if ( Image_Status::RESTORING_FAILED === $status ) {
37		- $data['message'] = esc_html__( 'Image restoring failed', 'image-optimizer' );
	56	+ $data['message'] = esc_html__( 'Image restoring failed', 'image-optimization' );
38	57	}
39	58
40	59	if ( Image_Status::OPTIMIZATION_FAILED === $status ) {
41	60	$error_type = $meta->get_error_type() ?? Image_Optimization_Error_Type::GENERIC;
42		- $error_message = Image_Optimization_Error_Type::QUOTA_EXCEEDED === $error_type
43		- ? esc_html__( 'Plan quota reached', 'image-optimizer' )
44		- : esc_html__( 'Optimization error', 'image-optimizer' );
	61	+ $error_message = Optimization_Error_Message::get_optimization_error_message( $error_type );
45	62
	63	+ $data['error_type'] = $error_type;
46	64	$data['message'] = $error_message;
47	65	$data['images_left'] = $images_left;
48	66	}
49	67
		@@ -48,12 +66,11 @@
48	66	}
49	67
50	68	if ( Image_Status::REOPTIMIZING_FAILED === $status ) {
51	69	$error_type = $meta->get_error_type() ?? Image_Optimization_Error_Type::GENERIC;
52		- $error_message = Image_Optimization_Error_Type::QUOTA_EXCEEDED === $error_type
53		- ? esc_html__( 'Plan quota reached', 'image-optimizer' )
54		- : esc_html__( 'Image reoptimizing failed', 'image-optimizer' );
	70	+ $error_message = Optimization_Error_Message::get_reoptimization_error_message( $error_type );
55	71
	72	+ $data['error_type'] = $error_type;
56	73	$data['message'] = $error_message;
57	74	$data['images_left'] = $images_left;
58	75	}
59	76