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